mq.py
3404 lines
| 123.5 KiB
| text/x-python
|
PythonLexer
/ hgext / mq.py
|
r6187 | # mq.py - patch queues for mercurial | ||
|
r1808 | # | ||
|
r2859 | # Copyright 2005, 2006 Chris Mason <mason@suse.com> | ||
|
r1808 | # | ||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r1808 | |||
|
r8932 | '''manage a stack of patches | ||
|
r2554 | |||
This extension lets you work with a stack of patches in a Mercurial | ||||
|
r7983 | repository. It manages two stacks of patches - all known patches, and | ||
|
r2554 | applied patches (subset of known patches). | ||
Known patches are represented as patch files in the .hg/patches | ||||
|
r7983 | directory. Applied patches are both patch files and changesets. | ||
|
r2554 | |||
|
r10973 | Common tasks (use :hg:`help command` for more details):: | ||
|
r2554 | |||
|
r9157 | create new patch qnew | ||
import existing patch qimport | ||||
|
r2554 | |||
|
r9157 | print patch series qseries | ||
print applied patches qapplied | ||||
|
r2554 | |||
|
r9157 | add known patch to applied stack qpush | ||
remove patch from applied stack qpop | ||||
refresh contents of top applied patch qrefresh | ||||
|
r10190 | |||
By default, mq will automatically use git patches when required to | ||||
avoid losing file mode changes, copy records, binary files or empty | ||||
files creations or deletions. This behaviour can be configured with:: | ||||
[mq] | ||||
git = auto/keep/yes/no | ||||
If set to 'keep', mq will obey the [diff] section configuration while | ||||
preserving existing git patches upon qrefresh. If set to 'yes' or | ||||
'no', mq will override the [diff] section and always generate git or | ||||
regular patches, possibly losing data in the second case. | ||||
|
r11234 | |||
|
r16040 | It may be desirable for mq changesets to be kept in the secret phase (see | ||
|
r16017 | :hg:`help phases`), which can be enabled with the following setting:: | ||
[mq] | ||||
secret = True | ||||
|
r11234 | You will by default be managing a patch queue named "patches". You can | ||
create other, independent patch queues with the :hg:`qqueue` command. | ||||
|
r2554 | ''' | ||
|
r3891 | from mercurial.i18n import _ | ||
|
r7639 | from mercurial.node import bin, hex, short, nullid, nullrev | ||
|
r8112 | from mercurial.lock import release | ||
|
r14241 | from mercurial import commands, cmdutil, hg, scmutil, util, revset | ||
|
r15920 | from mercurial import repair, extensions, url, error, phases | ||
|
r14241 | from mercurial import patch as patchmod | ||
|
r14636 | import os, re, errno, shutil | ||
|
r1808 | |||
|
r5645 | commands.norepo += " qclone" | ||
|
r2720 | |||
|
r14298 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] | ||
cmdtable = {} | ||||
command = cmdutil.command(cmdtable) | ||||
|
r4037 | # Patch names looks like unix-file names. | ||
# They must be joinable with queue directory and result in the patch path. | ||||
normname = util.normpath | ||||
|
r8778 | class statusentry(object): | ||
|
r10682 | def __init__(self, node, name): | ||
self.node, self.name = node, name | ||||
|
r11375 | def __repr__(self): | ||
|
r10678 | return hex(self.node) + ':' + self.name | ||
|
r2780 | |||
|
r7399 | class patchheader(object): | ||
|
r10397 | def __init__(self, pf, plainmode=False): | ||
|
r8653 | def eatdiff(lines): | ||
while lines: | ||||
l = lines[-1] | ||||
if (l.startswith("diff -") or | ||||
l.startswith("Index:") or | ||||
l.startswith("===========")): | ||||
del lines[-1] | ||||
else: | ||||
break | ||||
def eatempty(lines): | ||||
while lines: | ||||
|
r10688 | if not lines[-1].strip(): | ||
|
r8653 | del lines[-1] | ||
else: | ||||
break | ||||
message = [] | ||||
comments = [] | ||||
user = None | ||||
date = None | ||||
|
r10397 | parent = None | ||
|
r8653 | format = None | ||
subject = None | ||||
|
r13229 | branch = None | ||
nodeid = None | ||||
|
r8653 | diffstart = 0 | ||
for line in file(pf): | ||||
line = line.rstrip() | ||||
|
r10730 | if (line.startswith('diff --git') | ||
or (diffstart and line.startswith('+++ '))): | ||||
|
r8653 | diffstart = 2 | ||
break | ||||
|
r10730 | diffstart = 0 # reset | ||
|
r8653 | 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:] | ||||
elif line.startswith("# Date "): | ||||
date = line[7:] | ||||
|
r10397 | elif line.startswith("# Parent "): | ||
|
r14170 | parent = line[9:].lstrip() | ||
|
r13229 | elif line.startswith("# Branch "): | ||
branch = line[9:] | ||||
elif line.startswith("# Node ID "): | ||||
nodeid = line[10:] | ||||
|
r8653 | elif not line.startswith("# ") and line: | ||
message.append(line) | ||||
format = None | ||||
elif line == '# HG changeset patch': | ||||
|
r9287 | message = [] | ||
|
r8653 | format = "hgpatch" | ||
elif (format != "tagdone" and (line.startswith("Subject: ") or | ||||
line.startswith("subject: "))): | ||||
subject = line[9:] | ||||
format = "tag" | ||||
elif (format != "tagdone" and (line.startswith("From: ") or | ||||
line.startswith("from: "))): | ||||
user = line[6:] | ||||
format = "tag" | ||||
|
r10397 | elif (format != "tagdone" and (line.startswith("Date: ") or | ||
line.startswith("date: "))): | ||||
date = line[6:] | ||||
format = "tag" | ||||
|
r8653 | 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" | ||||
elif message or line: | ||||
message.append(line) | ||||
comments.append(line) | ||||
eatdiff(message) | ||||
eatdiff(comments) | ||||
|
r13229 | # Remember the exact starting line of the patch diffs before consuming | ||
# empty lines, for external use by TortoiseHg and others | ||||
self.diffstartline = len(comments) | ||||
|
r8653 | 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) | ||||
|
r7399 | self.message = message | ||
self.comments = comments | ||||
self.user = user | ||||
self.date = date | ||||
|
r10397 | self.parent = parent | ||
|
r13229 | # nodeid and branch are for external use by TortoiseHg and others | ||
self.nodeid = nodeid | ||||
self.branch = branch | ||||
|
r8653 | self.haspatch = diffstart > 1 | ||
|
r10397 | self.plainmode = plainmode | ||
|
r7399 | |||
def setuser(self, user): | ||||
|
r8654 | if not self.updateheader(['From: ', '# User '], user): | ||
|
r7399 | try: | ||
patchheaderat = self.comments.index('# HG changeset patch') | ||||
|
r9334 | self.comments.insert(patchheaderat + 1, '# User ' + user) | ||
|
r7399 | except ValueError: | ||
|
r10397 | if self.plainmode or self._hasheader(['Date: ']): | ||
|
r9336 | self.comments = ['From: ' + user] + self.comments | ||
else: | ||||
tmp = ['# HG changeset patch', '# User ' + user, ''] | ||||
self.comments = tmp + self.comments | ||||
|
r7399 | self.user = user | ||
def setdate(self, date): | ||||
|
r9337 | if not self.updateheader(['Date: ', '# Date '], date): | ||
try: | ||||
patchheaderat = self.comments.index('# HG changeset patch') | ||||
self.comments.insert(patchheaderat + 1, '# Date ' + date) | ||||
except ValueError: | ||||
|
r10397 | if self.plainmode or self._hasheader(['From: ']): | ||
|
r9337 | self.comments = ['Date: ' + date] + self.comments | ||
else: | ||||
tmp = ['# HG changeset patch', '# Date ' + date, ''] | ||||
self.comments = tmp + self.comments | ||||
self.date = date | ||||
|
r7399 | |||
|
r10397 | def setparent(self, parent): | ||
if not self.updateheader(['# Parent '], parent): | ||||
try: | ||||
patchheaderat = self.comments.index('# HG changeset patch') | ||||
self.comments.insert(patchheaderat + 1, '# Parent ' + parent) | ||||
except ValueError: | ||||
pass | ||||
self.parent = parent | ||||
|
r7399 | def setmessage(self, message): | ||
if self.comments: | ||||
self._delmsg() | ||||
self.message = [message] | ||||
self.comments += self.message | ||||
|
r8654 | def updateheader(self, prefixes, new): | ||
|
r7399 | '''Update all references to a field in the patch header. | ||
|
r8654 | Return whether the field is present.''' | ||
|
r7399 | res = False | ||
for prefix in prefixes: | ||||
for i in xrange(len(self.comments)): | ||||
if self.comments[i].startswith(prefix): | ||||
self.comments[i] = prefix + new | ||||
res = True | ||||
break | ||||
return res | ||||
|
r9335 | def _hasheader(self, prefixes): | ||
'''Check if a header starts with any of the given prefixes.''' | ||||
for prefix in prefixes: | ||||
for comment in self.comments: | ||||
if comment.startswith(prefix): | ||||
return True | ||||
return False | ||||
|
r7399 | def __str__(self): | ||
if not self.comments: | ||||
return '' | ||||
return '\n'.join(self.comments) + '\n\n' | ||||
def _delmsg(self): | ||||
'''Remove existing message, keeping the rest of the comments fields. | ||||
If comments contains 'subject: ', message will prepend | ||||
the field and a blank line.''' | ||||
if self.message: | ||||
subj = 'subject: ' + self.message[0].lower() | ||||
for i in xrange(len(self.comments)): | ||||
if subj == self.comments[i].lower(): | ||||
del self.comments[i] | ||||
self.message = self.message[2:] | ||||
break | ||||
ci = 0 | ||||
|
r8632 | for mi in self.message: | ||
while mi != self.comments[ci]: | ||||
|
r7399 | ci += 1 | ||
del self.comments[ci] | ||||
|
r16102 | def newcommit(repo, phase, *args, **kwargs): | ||
|
r16057 | """helper dedicated to ensure a commit respect mq.secret setting | ||
It should be used instead of repo.commit inside the mq source for operation | ||||
creating new changeset. | ||||
|
r15926 | """ | ||
|
r16100 | if phase is None: | ||
if repo.ui.configbool('mq', 'secret', False): | ||||
phase = phases.secret | ||||
if phase is not None: | ||||
backup = repo.ui.backupconfig('phases', 'new-commit') | ||||
|
r16101 | # Marking the repository as committing an mq patch can be used | ||
# to optimize operations like _branchtags(). | ||||
repo._committingpatch = True | ||||
|
r15926 | try: | ||
|
r16100 | if phase is not None: | ||
repo.ui.setconfig('phases', 'new-commit', phase) | ||||
|
r15926 | return repo.commit(*args, **kwargs) | ||
finally: | ||||
|
r16101 | repo._committingpatch = False | ||
|
r16100 | if phase is not None: | ||
repo.ui.restoreconfig(backup) | ||||
|
r15926 | |||
|
r8778 | class queue(object): | ||
|
r1808 | def __init__(self, ui, path, patchdir=None): | ||
self.basepath = path | ||||
|
r11229 | try: | ||
|
r11270 | fh = open(os.path.join(path, 'patches.queue')) | ||
cur = fh.read().rstrip() | ||||
|
r13400 | fh.close() | ||
|
r11270 | if not cur: | ||
curpath = os.path.join(path, 'patches') | ||||
else: | ||||
curpath = os.path.join(path, 'patches-' + cur) | ||||
|
r11229 | except IOError: | ||
curpath = os.path.join(path, 'patches') | ||||
self.path = patchdir or curpath | ||||
|
r13970 | self.opener = scmutil.opener(self.path) | ||
|
r1808 | self.ui = ui | ||
|
r15879 | self.applieddirty = False | ||
self.seriesdirty = False | ||||
|
r11462 | self.added = [] | ||
|
r14587 | self.seriespath = "series" | ||
|
r14588 | self.statuspath = "status" | ||
|
r14589 | self.guardspath = "guards" | ||
|
r14590 | self.activeguards = None | ||
|
r14591 | self.guardsdirty = False | ||
|
r10190 | # Handle mq.git as a bool with extended values | ||
try: | ||||
gitmode = ui.configbool('mq', 'git', None) | ||||
if gitmode is None: | ||||
raise error.ConfigError() | ||||
self.gitmode = gitmode and 'yes' or 'no' | ||||
except error.ConfigError: | ||||
self.gitmode = ui.config('mq', 'git', 'auto').lower() | ||||
|
r10397 | self.plainmode = ui.configbool('mq', 'plain', False) | ||
|
r1810 | |||
|
r8524 | @util.propertycache | ||
def applied(self): | ||||
|
r15258 | def parselines(lines): | ||
for l in lines: | ||||
entry = l.split(':', 1) | ||||
if len(entry) > 1: | ||||
n, name = entry | ||||
yield statusentry(bin(n), name) | ||||
elif l.strip(): | ||||
self.ui.warn(_('malformated mq status line: %s\n') % entry) | ||||
# else we ignore empty lines | ||||
try: | ||||
|
r14588 | lines = self.opener.read(self.statuspath).splitlines() | ||
|
r13507 | return list(parselines(lines)) | ||
|
r15258 | except IOError, e: | ||
if e.errno == errno.ENOENT: | ||||
return [] | ||||
raise | ||||
|
r8524 | |||
@util.propertycache | ||||
|
r14572 | def fullseries(self): | ||
|
r15258 | try: | ||
|
r15878 | return self.opener.read(self.seriespath).splitlines() | ||
|
r15258 | except IOError, e: | ||
if e.errno == errno.ENOENT: | ||||
return [] | ||||
raise | ||||
|
r8524 | |||
@util.propertycache | ||||
def series(self): | ||||
|
r14575 | self.parseseries() | ||
|
r8524 | return self.series | ||
@util.propertycache | ||||
|
r14573 | def seriesguards(self): | ||
|
r14575 | self.parseseries() | ||
|
r14573 | return self.seriesguards | ||
|
r1808 | |||
|
r8525 | def invalidate(self): | ||
|
r14573 | for a in 'applied fullseries series seriesguards'.split(): | ||
|
r8525 | if a in self.__dict__: | ||
delattr(self, a) | ||||
|
r15879 | self.applieddirty = False | ||
self.seriesdirty = False | ||||
|
r14591 | self.guardsdirty = False | ||
|
r14590 | self.activeguards = None | ||
|
r8525 | |||
|
r10184 | def diffopts(self, opts={}, patchfn=None): | ||
|
r14241 | diffopts = patchmod.diffopts(self.ui, opts) | ||
|
r10190 | if self.gitmode == 'auto': | ||
diffopts.upgrade = True | ||||
elif self.gitmode == 'keep': | ||||
pass | ||||
elif self.gitmode in ('yes', 'no'): | ||||
diffopts.git = self.gitmode == 'yes' | ||||
else: | ||||
raise util.Abort(_('mq.git option can be auto/keep/yes/no' | ||||
' got %s') % self.gitmode) | ||||
|
r10184 | if patchfn: | ||
|
r10185 | diffopts = self.patchopts(diffopts, patchfn) | ||
return diffopts | ||||
|
r10186 | def patchopts(self, diffopts, *patches): | ||
|
r10185 | """Return a copy of input diff options with git set to true if | ||
|
r10190 | referenced patch is a git patch and should be preserved as such. | ||
|
r10185 | """ | ||
diffopts = diffopts.copy() | ||||
|
r10190 | if not diffopts.git and self.gitmode == 'keep': | ||
for patchfn in patches: | ||||
patchf = self.opener(patchfn, 'r') | ||||
# if the patch was a git patch, refresh it as a git patch | ||||
for line in patchf: | ||||
if line.startswith('diff --git'): | ||||
diffopts.git = True | ||||
break | ||||
patchf.close() | ||||
|
r10184 | return diffopts | ||
|
r2874 | |||
|
r2819 | def join(self, *p): | ||
return os.path.join(self.path, *p) | ||||
|
r14574 | def findseries(self, patch): | ||
|
r10685 | def matchpatch(l): | ||
l = l.split('#', 1)[0] | ||||
return l.strip() == patch | ||||
|
r14572 | for index, l in enumerate(self.fullseries): | ||
|
r10685 | if matchpatch(l): | ||
return index | ||||
|
r1808 | return None | ||
|
r2821 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') | ||
|
r14575 | def parseseries(self): | ||
|
r1808 | self.series = [] | ||
|
r14573 | self.seriesguards = [] | ||
|
r14572 | for l in self.fullseries: | ||
|
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') % | ||||
|
r14587 | (patch, self.join(self.seriespath))) | ||
|
r2821 | self.series.append(patch) | ||
|
r14573 | self.seriesguards.append(self.guard_re.findall(comment)) | ||
|
r2821 | |||
|
r14576 | def checkguard(self, guard): | ||
|
r6607 | if not guard: | ||
return _('guard cannot be an empty string') | ||||
|
r2821 | bad_chars = '# \t\r\n\f' | ||
first = guard[0] | ||||
|
r8288 | if first in '-+': | ||
return (_('guard %r starts with invalid character: %r') % | ||||
(guard, first)) | ||||
|
r2821 | for c in bad_chars: | ||
if c in guard: | ||||
return _('invalid character in guard %r: %r') % (guard, c) | ||||
|
r3223 | |||
|
r14578 | def setactive(self, guards): | ||
|
r2821 | for guard in guards: | ||
|
r14576 | bad = self.checkguard(guard) | ||
|
r2821 | if bad: | ||
raise util.Abort(bad) | ||||
|
r8209 | guards = sorted(set(guards)) | ||
|
r9467 | self.ui.debug('active guards: %s\n' % ' '.join(guards)) | ||
|
r14590 | self.activeguards = guards | ||
|
r14591 | self.guardsdirty = True | ||
|
r2821 | |||
def active(self): | ||||
|
r14590 | if self.activeguards is None: | ||
self.activeguards = [] | ||||
|
r2821 | try: | ||
|
r14589 | guards = self.opener.read(self.guardspath).split() | ||
|
r2821 | except IOError, err: | ||
|
r10282 | if err.errno != errno.ENOENT: | ||
raise | ||||
|
r2821 | guards = [] | ||
for i, guard in enumerate(guards): | ||||
|
r14576 | bad = self.checkguard(guard) | ||
|
r2821 | if bad: | ||
self.ui.warn('%s:%d: %s\n' % | ||||
|
r14589 | (self.join(self.guardspath), i + 1, bad)) | ||
|
r2821 | else: | ||
|
r14590 | self.activeguards.append(guard) | ||
return self.activeguards | ||||
|
r2821 | |||
|
r14577 | def setguards(self, idx, guards): | ||
|
r2821 | 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) | ||||
|
r14576 | bad = self.checkguard(g[1:]) | ||
|
r2821 | if bad: | ||
raise util.Abort(bad) | ||||
|
r14572 | drop = self.guard_re.sub('', self.fullseries[idx]) | ||
self.fullseries[idx] = drop + ''.join([' #' + g for g in guards]) | ||||
|
r14575 | self.parseseries() | ||
|
r14593 | self.seriesdirty = True | ||
|
r3223 | |||
|
r2821 | def pushable(self, idx): | ||
if isinstance(idx, str): | ||||
idx = self.series.index(idx) | ||||
|
r14573 | patchguards = self.seriesguards[idx] | ||
|
r2821 | if not patchguards: | ||
return True, None | ||||
guards = self.active() | ||||
exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] | ||||
if exactneg: | ||||
|
r14464 | return False, repr(exactneg[0]) | ||
|
r2821 | 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: | ||
|
r14464 | return True, repr(exactpos[0]) | ||
return False, ' '.join(map(repr, pos)) | ||||
|
r2821 | return True, '' | ||
|
r14579 | def explainpushable(self, idx, all_patches=False): | ||
|
r2821 | 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: | ||||
|
r14464 | write(_('allowing %s - guarded by %s\n') % | ||
|
r2821 | (self.series[idx], why)) | ||
if not pushable: | ||||
|
r2829 | if why: | ||
|
r14464 | write(_('skipping %s - guarded by %s\n') % | ||
|
r3870 | (self.series[idx], why)) | ||
|
r2821 | else: | ||
write(_('skipping %s - no matching guards\n') % | ||||
self.series[idx]) | ||||
|
r1810 | |||
|
r14580 | def savedirty(self): | ||
|
r14594 | def writelist(items, path): | ||
|
r2772 | fp = self.opener(path, 'w') | ||
for i in items: | ||||
|
r5878 | fp.write("%s\n" % i) | ||
|
r2772 | fp.close() | ||
|
r14592 | if self.applieddirty: | ||
|
r14594 | writelist(map(str, self.applied), self.statuspath) | ||
|
r15883 | self.applieddirty = False | ||
|
r14593 | if self.seriesdirty: | ||
|
r14594 | writelist(self.fullseries, self.seriespath) | ||
|
r15883 | self.seriesdirty = False | ||
|
r14591 | if self.guardsdirty: | ||
|
r14594 | writelist(self.activeguards, self.guardspath) | ||
|
r15883 | self.guardsdirty = False | ||
|
r11546 | if self.added: | ||
qrepo = self.qrepo() | ||||
if qrepo: | ||||
|
r12658 | qrepo[None].add(f for f in self.added if f not in qrepo[None]) | ||
|
r11546 | self.added = [] | ||
|
r1808 | |||
|
r4207 | def removeundo(self, repo): | ||
undo = repo.sjoin('undo') | ||||
if not os.path.exists(undo): | ||||
return | ||||
try: | ||||
os.unlink(undo) | ||||
except OSError, inst: | ||||
|
r6960 | self.ui.warn(_('error removing undo: %s\n') % str(inst)) | ||
|
r4207 | |||
|
r10184 | def printdiff(self, repo, diffopts, node1, node2=None, files=None, | ||
|
r2937 | fp=None, changes=None, opts={}): | ||
|
r9640 | stat = opts.get('stat') | ||
|
r14671 | m = scmutil.match(repo[node1], files, opts) | ||
|
r11050 | cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, | ||
changes, stat, fp) | ||||
|
r2874 | |||
|
r10184 | def mergeone(self, repo, mergeq, head, patch, rev, diffopts): | ||
|
r1808 | # first try just applying the patch | ||
|
r10282 | (err, n) = self.apply(repo, [patch], update_status=False, | ||
|
r4917 | strict=True, merge=rev) | ||
|
r1808 | |||
if err == 0: | ||||
return (err, n) | ||||
if n is None: | ||||
|
r2712 | raise util.Abort(_("apply failed for patch %s") % patch) | ||
|
r1808 | |||
|
r6960 | self.ui.warn(_("patch didn't work out, merging %s\n") % patch) | ||
|
r1808 | |||
# apply failed, strip away that rev and merge. | ||||
|
r4917 | hg.clean(repo, head) | ||
|
r11789 | self.strip(repo, [n], update=False, backup='strip') | ||
|
r1808 | |||
|
r6747 | ctx = repo[rev] | ||
|
r4917 | ret = hg.merge(repo, rev) | ||
|
r1808 | if ret: | ||
|
r2712 | raise util.Abort(_("update returned %d") % ret) | ||
|
r16102 | n = newcommit(repo, None, ctx.description(), ctx.user(), force=True) | ||
|
r8527 | if n is None: | ||
|
r2712 | raise util.Abort(_("repo commit failed")) | ||
|
r1808 | try: | ||
|
r10397 | ph = patchheader(mergeq.join(patch), self.plainmode) | ||
|
r1808 | except: | ||
|
r2712 | raise util.Abort(_("unable to read %s") % patch) | ||
|
r1808 | |||
|
r10185 | diffopts = self.patchopts(diffopts, patch) | ||
|
r1852 | patchf = self.opener(patch, "w") | ||
|
r7399 | comments = str(ph) | ||
|
r1808 | if comments: | ||
patchf.write(comments) | ||||
|
r10184 | self.printdiff(repo, diffopts, head, n, fp=patchf) | ||
|
r1808 | patchf.close() | ||
|
r4207 | self.removeundo(repo) | ||
|
r1808 | return (0, n) | ||
|
r1810 | |||
|
r1808 | def qparents(self, repo, rev=None): | ||
if rev is None: | ||||
(p1, p2) = repo.dirstate.parents() | ||||
|
r7639 | if p2 == nullid: | ||
|
r1808 | return p1 | ||
|
r10686 | if not self.applied: | ||
|
r1808 | return None | ||
|
r10678 | return self.applied[-1].node | ||
p1, p2 = repo.changelog.parents(rev) | ||||
|
r10680 | if p2 != nullid and p2 in [x.node for x in self.applied]: | ||
return p2 | ||||
|
r10678 | return p1 | ||
|
r1808 | |||
|
r10184 | def mergepatch(self, repo, mergeq, series, diffopts): | ||
|
r10686 | if not self.applied: | ||
|
r1808 | # 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" | ||||
|
r16102 | n = newcommit(repo, None, '[mq]: merge marker', force=True) | ||
|
r4207 | self.removeundo(repo) | ||
|
r10678 | self.applied.append(statusentry(n, pname)) | ||
|
r15879 | self.applieddirty = True | ||
|
r1808 | |||
head = self.qparents(repo) | ||||
for patch in series: | ||||
|
r2696 | patch = mergeq.lookup(patch, strict=True) | ||
|
r1808 | if not patch: | ||
|
r6960 | self.ui.warn(_("patch %s does not exist\n") % patch) | ||
|
r1808 | return (1, None) | ||
|
r2821 | pushable, reason = self.pushable(patch) | ||
if not pushable: | ||||
|
r14579 | self.explainpushable(patch, all_patches=True) | ||
|
r2821 | continue | ||
|
r1808 | info = mergeq.isapplied(patch) | ||
if not info: | ||||
|
r6960 | self.ui.warn(_("patch %s is not applied\n") % patch) | ||
|
r1808 | return (1, None) | ||
|
r10678 | rev = info[1] | ||
|
r10184 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) | ||
|
r1808 | if head: | ||
|
r10678 | self.applied.append(statusentry(head, patch)) | ||
|
r15879 | self.applieddirty = True | ||
|
r1808 | if err: | ||
return (err, head) | ||||
|
r14580 | self.savedirty() | ||
|
r1808 | return (0, head) | ||
|
r2748 | def patch(self, repo, patchfile): | ||
'''Apply patchfile to the working directory. | ||||
|
r8761 | patchfile: name of patch file''' | ||
|
r14564 | files = set() | ||
|
r2748 | try: | ||
|
r14260 | fuzz = patchmod.patch(self.ui, repo, patchfile, strip=1, | ||
|
r14382 | files=files, eolmode=None) | ||
|
r14260 | return (True, list(files), fuzz) | ||
|
r2919 | except Exception, inst: | ||
self.ui.note(str(inst) + '\n') | ||||
if not self.ui.verbose: | ||||
|
r6960 | self.ui.warn(_("patch failed, unable to continue (try -v)\n")) | ||
|
r15085 | self.ui.traceback() | ||
|
r14260 | return (False, list(files), False) | ||
|
r2796 | |||
|
r1810 | def apply(self, repo, series, list=False, update_status=True, | ||
|
r10661 | strict=False, patchdir=None, merge=None, all_files=None): | ||
|
r4917 | wlock = lock = tr = None | ||
|
r4418 | try: | ||
|
r4917 | wlock = repo.wlock() | ||
|
r4915 | lock = repo.lock() | ||
|
r10881 | tr = repo.transaction("qpush") | ||
|
r4418 | try: | ||
|
r4970 | ret = self._apply(repo, series, list, update_status, | ||
|
r4917 | strict, patchdir, merge, all_files=all_files) | ||
|
r4915 | tr.close() | ||
|
r14580 | self.savedirty() | ||
|
r4915 | return ret | ||
except: | ||||
try: | ||||
tr.abort() | ||||
finally: | ||||
repo.invalidate() | ||||
repo.dirstate.invalidate() | ||||
|
r15881 | self.invalidate() | ||
|
r4915 | raise | ||
finally: | ||||
|
r11230 | release(tr, lock, wlock) | ||
|
r5527 | self.removeundo(repo) | ||
|
r4418 | |||
|
r4970 | def _apply(self, repo, series, list=False, update_status=True, | ||
|
r10661 | strict=False, patchdir=None, merge=None, all_files=None): | ||
|
r8875 | '''returns (error, hash) | ||
error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz''' | ||||
|
r1808 | # TODO unify with commands.py | ||
if not patchdir: | ||||
patchdir = self.path | ||||
err = 0 | ||||
n = None | ||||
|
r2934 | for patchname in series: | ||
pushable, reason = self.pushable(patchname) | ||||
|
r2821 | if not pushable: | ||
|
r14579 | self.explainpushable(patchname, all_patches=True) | ||
|
r2821 | continue | ||
|
r9111 | self.ui.status(_("applying %s\n") % patchname) | ||
|
r2934 | pf = os.path.join(patchdir, patchname) | ||
|
r1808 | |||
try: | ||||
|
r10397 | ph = patchheader(self.join(patchname), self.plainmode) | ||
|
r14239 | except IOError: | ||
|
r8875 | self.ui.warn(_("unable to read %s\n") % patchname) | ||
|
r1808 | err = 1 | ||
break | ||||
|
r7399 | message = ph.message | ||
|
r1808 | if not message: | ||
|
r12849 | # The commit message should not be translated | ||
|
r10274 | message = "imported patch %s\n" % patchname | ||
|
r1808 | else: | ||
if list: | ||||
|
r12849 | # The commit message should not be translated | ||
|
r10274 | message.append("\nimported patch %s" % patchname) | ||
|
r1808 | message = '\n'.join(message) | ||
|
r7782 | if ph.haspatch: | ||
(patcherr, files, fuzz) = self.patch(repo, pf) | ||||
|
r10661 | if all_files is not None: | ||
all_files.update(files) | ||||
|
r7782 | patcherr = not patcherr | ||
else: | ||||
self.ui.warn(_("patch %s is empty\n") % patchname) | ||||
patcherr, files, fuzz = 0, [], 0 | ||||
|
r1808 | |||
|
r2934 | if merge and files: | ||
|
r4332 | # Mark as removed/merged and update dirstate parent info | ||
removed = [] | ||||
merged = [] | ||||
for f in files: | ||||
|
r12344 | if os.path.lexists(repo.wjoin(f)): | ||
|
r4332 | merged.append(f) | ||
else: | ||||
removed.append(f) | ||||
|
r4904 | for f in removed: | ||
repo.dirstate.remove(f) | ||||
for f in merged: | ||||
repo.dirstate.merge(f) | ||||
|
r1810 | p1, p2 = repo.dirstate.parents() | ||
repo.dirstate.setparents(p1, merge) | ||||
|
r6603 | |||
|
r14322 | match = scmutil.matchfiles(repo, files or []) | ||
|
r16043 | oldtip = repo['tip'] | ||
|
r16102 | n = newcommit(repo, None, message, ph.user, ph.date, match=match, | ||
force=True) | ||||
|
r16043 | if repo['tip'] == oldtip: | ||
raise util.Abort(_("qpush exactly duplicates child changeset")) | ||||
|
r8527 | if n is None: | ||
|
r12850 | raise util.Abort(_("repository commit failed")) | ||
|
r1808 | |||
if update_status: | ||||
|
r10678 | self.applied.append(statusentry(n, patchname)) | ||
|
r1808 | |||
if patcherr: | ||||
|
r7782 | self.ui.warn(_("patch failed, rejects left in working dir\n")) | ||
|
r8875 | err = 2 | ||
|
r1808 | break | ||
if fuzz and strict: | ||||
|
r6960 | self.ui.warn(_("fuzz found when applying patch, stopping\n")) | ||
|
r8875 | err = 3 | ||
|
r1808 | break | ||
return (err, n) | ||||
|
r8833 | def _cleanup(self, patches, numrevs, keep=False): | ||
if not keep: | ||||
r = self.qrepo() | ||||
if r: | ||||
|
r14435 | r[None].forget(patches) | ||
for p in patches: | ||||
os.unlink(self.join(p)) | ||||
|
r8833 | |||
|
r15920 | qfinished = [] | ||
|
r8833 | if numrevs: | ||
|
r14010 | qfinished = self.applied[:numrevs] | ||
|
r8833 | del self.applied[:numrevs] | ||
|
r15879 | self.applieddirty = True | ||
|
r8833 | |||
|
r14010 | unknown = [] | ||
|
r14574 | for (i, p) in sorted([(self.findseries(p), p) for p in patches], | ||
|
r14010 | reverse=True): | ||
if i is not None: | ||||
|
r14572 | del self.fullseries[i] | ||
|
r14010 | else: | ||
unknown.append(p) | ||||
if unknown: | ||||
if numrevs: | ||||
rev = dict((entry.name, entry.node) for entry in qfinished) | ||||
for p in unknown: | ||||
msg = _('revision %s refers to unknown patches: %s\n') | ||||
self.ui.warn(msg % (short(rev[p]), p)) | ||||
else: | ||||
msg = _('unknown patches: %s\n') | ||||
raise util.Abort(''.join(msg % p for p in unknown)) | ||||
|
r14575 | self.parseseries() | ||
|
r15879 | self.seriesdirty = True | ||
|
r15920 | return [entry.node for entry in qfinished] | ||
|
r6645 | |||
|
r8833 | def _revpatches(self, repo, revs): | ||
|
r10678 | firstrev = repo[self.applied[0].node].rev() | ||
|
r6645 | patches = [] | ||
|
r8833 | for i, rev in enumerate(revs): | ||
|
r8832 | |||
|
r6645 | if rev < firstrev: | ||
raise util.Abort(_('revision %d is not managed') % rev) | ||||
|
r8832 | |||
ctx = repo[rev] | ||||
|
r10678 | base = self.applied[i].node | ||
|
r8832 | if ctx.node() != base: | ||
msg = _('cannot delete revision %d above applied patches') | ||||
raise util.Abort(msg % rev) | ||||
|
r8833 | patch = self.applied[i].name | ||
|
r8832 | for fmt in ('[mq]: %s', 'imported patch %s'): | ||
if ctx.description() == fmt % patch: | ||||
msg = _('patch %s finalized without changeset message\n') | ||||
repo.ui.status(msg % patch) | ||||
break | ||||
|
r8833 | patches.append(patch) | ||
return patches | ||||
|
r6645 | |||
|
r8833 | def finish(self, repo, revs): | ||
|
r16029 | # Manually trigger phase computation to ensure phasedefaults is | ||
# executed before we remove the patches. | ||||
repo._phaserev | ||||
|
r8833 | patches = self._revpatches(repo, sorted(revs)) | ||
|
r15920 | qfinished = self._cleanup(patches, len(patches)) | ||
|
r16029 | if qfinished and repo.ui.configbool('mq', 'secret', False): | ||
# only use this logic when the secret option is added | ||||
|
r15920 | oldqbase = repo[qfinished[0]] | ||
if oldqbase.p1().phase() < phases.secret: | ||||
|
r15931 | phases.advanceboundary(repo, phases.draft, qfinished) | ||
|
r6645 | |||
|
r3088 | def delete(self, repo, patches, opts): | ||
|
r4736 | if not patches and not opts.get('rev'): | ||
|
r4737 | raise util.Abort(_('qdelete requires at least one revision or ' | ||
'patch name')) | ||||
|
r4736 | |||
|
r11365 | realpatches = [] | ||
|
r2905 | 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) | ||||
|
r12655 | if patch not in realpatches: | ||
realpatches.append(patch) | ||||
|
r3373 | |||
|
r8833 | numrevs = 0 | ||
|
r3373 | if opts.get('rev'): | ||
if not self.applied: | ||||
raise util.Abort(_('no patches applied')) | ||||
|
r14319 | revs = scmutil.revrange(repo, opts.get('rev')) | ||
|
r3373 | if len(revs) > 1 and revs[0] > revs[1]: | ||
revs.reverse() | ||||
|
r8833 | revpatches = self._revpatches(repo, revs) | ||
|
r11365 | realpatches += revpatches | ||
|
r8833 | numrevs = len(revpatches) | ||
|
r2905 | |||
|
r11365 | self._cleanup(realpatches, numrevs, opts.get('keep')) | ||
|
r1810 | |||
|
r14581 | def checktoppatch(self, repo): | ||
|
r10686 | if self.applied: | ||
|
r10678 | top = self.applied[-1].node | ||
|
r10191 | patch = self.applied[-1].name | ||
|
r1808 | pp = repo.dirstate.parents() | ||
if top not in pp: | ||||
|
r5432 | raise util.Abort(_("working directory revision is not qtip")) | ||
|
r10191 | return top, patch | ||
return None, None | ||||
|
r14582 | def checksubstate(self, repo): | ||
|
r13174 | '''return list of subrepos at a different revision than substate. | ||
Abort if any subrepos have uncommitted changes.''' | ||||
inclsubs = [] | ||||
wctx = repo[None] | ||||
for s in wctx.substate: | ||||
if wctx.sub(s).dirty(True): | ||||
raise util.Abort( | ||||
_("uncommitted changes in subrepository %s") % s) | ||||
elif wctx.sub(s).dirty(): | ||||
inclsubs.append(s) | ||||
return inclsubs | ||||
|
r14256 | def localchangesfound(self, refresh=True): | ||
if refresh: | ||||
raise util.Abort(_("local changes found, refresh first")) | ||||
else: | ||||
raise util.Abort(_("local changes found")) | ||||
|
r14583 | def checklocalchanges(self, repo, force=False, refresh=True): | ||
|
r2875 | m, a, r, d = repo.status()[:4] | ||
|
r10372 | if (m or a or r or d) and not force: | ||
|
r14256 | self.localchangesfound(refresh) | ||
|
r2875 | return m, a, r, d | ||
|
r4713 | |||
|
r14051 | _reserved = ('series', 'status', 'guards', '.', '..') | ||
|
r14584 | def checkreservedname(self, name): | ||
|
r14054 | if name in self._reserved: | ||
|
r5981 | raise util.Abort(_('"%s" cannot be used as the name of a patch') | ||
% name) | ||||
|
r14054 | for prefix in ('.hg', '.mq'): | ||
if name.startswith(prefix): | ||||
raise util.Abort(_('patch name cannot begin with "%s"') | ||||
% prefix) | ||||
for c in ('#', ':'): | ||||
if c in name: | ||||
raise util.Abort(_('"%s" cannot be used in the name of a patch') | ||||
% c) | ||||
|
r14422 | def checkpatchname(self, name, force=False): | ||
|
r14584 | self.checkreservedname(name) | ||
|
r14422 | if not force and os.path.exists(self.join(name)): | ||
if os.path.isdir(self.join(name)): | ||||
raise util.Abort(_('"%s" already exists as a directory') | ||||
% name) | ||||
else: | ||||
raise util.Abort(_('patch "%s" already exists') % name) | ||||
|
r5981 | |||
|
r7162 | def new(self, repo, patchfn, *pats, **opts): | ||
|
r7157 | """options: | ||
msg: a string or a no-argument function returning a string | ||||
""" | ||||
|
r4713 | msg = opts.get('msg') | ||
|
r5673 | user = opts.get('user') | ||
|
r5788 | date = opts.get('date') | ||
|
r6139 | if date: | ||
date = util.parsedate(date) | ||||
|
r10184 | diffopts = self.diffopts({'git': opts.get('git')}) | ||
|
r14424 | if opts.get('checkname', True): | ||
self.checkpatchname(patchfn) | ||||
|
r14582 | inclsubs = self.checksubstate(repo) | ||
|
r13174 | if inclsubs: | ||
inclsubs.append('.hgsubstate') | ||||
|
r4713 | if opts.get('include') or opts.get('exclude') or pats: | ||
|
r13174 | if inclsubs: | ||
pats = list(pats or []) + inclsubs | ||||
|
r14671 | match = scmutil.match(repo[None], pats, opts) | ||
|
r7161 | # detect missing files in pats | ||
def badfn(f, msg): | ||||
|
r13174 | if f != '.hgsubstate': # .hgsubstate is auto-created | ||
raise util.Abort('%s: %s' % (f, msg)) | ||||
|
r7161 | match.bad = badfn | ||
|
r6603 | m, a, r, d = repo.status(match=match)[:4] | ||
|
r4713 | else: | ||
|
r14583 | m, a, r, d = self.checklocalchanges(repo, force=True) | ||
|
r14322 | match = scmutil.matchfiles(repo, m + a + r + inclsubs) | ||
|
r10372 | if len(repo[None].parents()) > 1: | ||
raise util.Abort(_('cannot manage merge changesets')) | ||||
|
r2875 | commitfiles = m + a + r | ||
|
r14581 | self.checktoppatch(repo) | ||
|
r14585 | insert = self.fullseriesend() | ||
|
r1808 | wlock = repo.wlock() | ||
|
r4915 | try: | ||
|
r12878 | try: | ||
# if patch file write fails, abort early | ||||
p = self.opener(patchfn, "w") | ||||
except IOError, e: | ||||
raise util.Abort(_('cannot write patch "%s": %s') | ||||
% (patchfn, e.strerror)) | ||||
|
r7162 | try: | ||
|
r10397 | if self.plainmode: | ||
if user: | ||||
p.write("From: " + user + "\n") | ||||
if not date: | ||||
p.write("\n") | ||||
if date: | ||||
p.write("Date: %d %d\n\n" % date) | ||||
else: | ||||
|
r7162 | p.write("# HG changeset patch\n") | ||
|
r10413 | p.write("# Parent " | ||
|
r13878 | + hex(repo[None].p1().node()) + "\n") | ||
|
r7162 | if user: | ||
p.write("# User " + user + "\n") | ||||
|
r10397 | if date: | ||
p.write("# Date %s %s\n\n" % date) | ||||
|
r14943 | if util.safehasattr(msg, '__call__'): | ||
|
r7162 | msg = msg() | ||
commitmsg = msg and msg or ("[mq]: %s" % patchfn) | ||||
|
r16102 | n = newcommit(repo, None, commitmsg, user, date, match=match, | ||
force=True) | ||||
|
r8527 | if n is None: | ||
|
r7162 | raise util.Abort(_("repo commit failed")) | ||
try: | ||||
|
r14572 | self.fullseries[insert:insert] = [patchfn] | ||
|
r10678 | self.applied.append(statusentry(n, patchfn)) | ||
|
r14575 | self.parseseries() | ||
|
r15879 | self.seriesdirty = True | ||
self.applieddirty = True | ||||
|
r7162 | if msg: | ||
|
r7614 | msg = msg + "\n\n" | ||
|
r7162 | p.write(msg) | ||
if commitfiles: | ||||
parent = self.qparents(repo, n) | ||||
|
r14241 | chunks = patchmod.diff(repo, node1=parent, node2=n, | ||
|
r7308 | match=match, opts=diffopts) | ||
for chunk in chunks: | ||||
p.write(chunk) | ||||
|
r7162 | p.close() | ||
r = self.qrepo() | ||||
|
r10282 | if r: | ||
|
r11303 | r[None].add([patchfn]) | ||
|
r7162 | except: | ||
repo.rollback() | ||||
raise | ||||
|
r7280 | except Exception: | ||
|
r7162 | patchpath = self.join(patchfn) | ||
try: | ||||
os.unlink(patchpath) | ||||
except: | ||||
self.ui.warn(_('error unlinking %s\n') % patchpath) | ||||
raise | ||||
|
r4915 | self.removeundo(repo) | ||
finally: | ||||
|
r8112 | release(wlock) | ||
|
r1808 | |||
|
r11789 | def strip(self, repo, revs, update=True, backup="all", force=None): | ||
|
r4917 | wlock = lock = None | ||
|
r4915 | try: | ||
|
r1808 | wlock = repo.wlock() | ||
|
r4915 | lock = repo.lock() | ||
|
r1808 | |||
|
r4915 | if update: | ||
|
r14583 | self.checklocalchanges(repo, force=force, refresh=False) | ||
|
r11789 | urev = self.qparents(repo, revs[0]) | ||
|
r4917 | hg.clean(repo, urev) | ||
|
r4915 | repo.dirstate.write() | ||
|
r1808 | |||
|
r11789 | for rev in revs: | ||
repair.strip(self.ui, repo, rev, backup) | ||||
|
r4915 | finally: | ||
|
r8112 | release(lock, wlock) | ||
|
r1810 | |||
|
r1808 | def isapplied(self, patch): | ||
"""returns (index, rev, patch)""" | ||||
|
r8632 | for i, a in enumerate(self.applied): | ||
|
r2780 | if a.name == patch: | ||
|
r10678 | return (i, a.node, 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 | ||
# | ||||
|
r15256 | # 1) a number (as string) to indicate an offset in the series file | ||
|
r2696 | # 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): | ||||
|
r14595 | def partialname(s): | ||
|
r2696 | 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] | ||||
|
r10686 | if self.series and self.applied: | ||
|
r2696 | if s == 'qtip': | ||
|
r14586 | return self.series[self.seriesend(True)-1] | ||
|
r2696 | if s == 'qbase': | ||
return self.series[0] | ||||
return None | ||||
|
r7568 | |||
if patch in self.series: | ||||
return patch | ||||
|
r2696 | |||
|
r2819 | if not os.path.isfile(self.join(patch)): | ||
|
r1808 | try: | ||
sno = int(patch) | ||||
|
r10282 | except (ValueError, OverflowError): | ||
|
r2696 | pass | ||
else: | ||||
|
r7568 | if -len(self.series) <= sno < len(self.series): | ||
|
r2821 | return self.series[sno] | ||
|
r7568 | |||
|
r2696 | if not strict: | ||
|
r14595 | res = partialname(patch) | ||
|
r2696 | if res: | ||
return res | ||||
|
r3082 | minus = patch.rfind('-') | ||
if minus >= 0: | ||||
|
r14595 | res = partialname(patch[:minus]) | ||
|
r2696 | if res: | ||
i = self.series.index(res) | ||||
try: | ||||
|
r10282 | off = int(patch[minus + 1:] or 1) | ||
except (ValueError, OverflowError): | ||||
|
r2696 | pass | ||
else: | ||||
if i - off >= 0: | ||||
return self.series[i - off] | ||||
|
r3082 | plus = patch.rfind('+') | ||
if plus >= 0: | ||||
|
r14595 | res = partialname(patch[:plus]) | ||
|
r2696 | if res: | ||
i = self.series.index(res) | ||||
try: | ||||
|
r10282 | off = int(patch[plus + 1:] or 1) | ||
except (ValueError, OverflowError): | ||||
|
r2696 | 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, | ||
|
r13033 | mergeq=None, all=False, move=False, exact=False): | ||
|
r10184 | diffopts = self.diffopts() | ||
|
r4917 | wlock = repo.wlock() | ||
|
r8795 | try: | ||
|
r10362 | heads = [] | ||
for b, ls in repo.branchmap().iteritems(): | ||||
heads += ls | ||||
if not heads: | ||||
heads = [nullid] | ||||
|
r13878 | if repo.dirstate.p1() not in heads and not exact: | ||
|
r8795 | self.ui.status(_("(working directory not at a head)\n")) | ||
|
r6340 | |||
|
r8795 | if not self.series: | ||
self.ui.warn(_('no patches in series\n')) | ||||
return 0 | ||||
|
r7398 | |||
|
r4915 | # Suppose our series file is: A B C and the current 'top' | ||
# patch is B. qpush C should be performed (moving forward) | ||||
# qpush B is a NOP (no change) qpush A is an error (can't | ||||
# go backwards with qpush) | ||||
if patch: | ||||
|
r15257 | patch = self.lookup(patch) | ||
|
r4915 | info = self.isapplied(patch) | ||
|
r13369 | if info and info[0] >= len(self.applied) - 1: | ||
|
r7398 | self.ui.warn( | ||
_('qpush: %s is already at the top\n') % patch) | ||||
|
r11439 | return 0 | ||
|
r13369 | |||
|
r7398 | pushable, reason = self.pushable(patch) | ||
|
r13369 | if pushable: | ||
|
r14586 | if self.series.index(patch) < self.seriesend(): | ||
|
r13369 | raise util.Abort( | ||
_("cannot push to a previous patch: %s") % patch) | ||||
else: | ||||
|
r7398 | if reason: | ||
|
r14464 | reason = _('guarded by %s') % reason | ||
|
r4915 | else: | ||
|
r7398 | reason = _('no matching guards') | ||
self.ui.warn(_("cannot push '%s' - %s\n") % (patch, reason)) | ||||
return 1 | ||||
elif all: | ||||
patch = self.series[-1] | ||||
if self.isapplied(patch): | ||||
self.ui.warn(_('all patches are currently applied\n')) | ||||
return 0 | ||||
|
r4100 | |||
|
r4915 | # Following the above example, starting at 'top' of B: | ||
# qpush should be performed (pushes C), but a subsequent | ||||
# qpush without an argument is an error (nothing to | ||||
# apply). This allows a loop of "...while hg qpush..." to | ||||
# work as it detects an error when done | ||||
|
r14586 | start = self.seriesend() | ||
|
r7398 | if start == len(self.series): | ||
|
r4915 | self.ui.warn(_('patch series already fully applied\n')) | ||
return 1 | ||||
|
r14732 | if not force: | ||
self.checklocalchanges(repo, refresh=self.applied) | ||||
|
r1810 | |||
|
r13033 | if exact: | ||
if move: | ||||
raise util.Abort(_("cannot use --exact and --move together")) | ||||
if self.applied: | ||||
raise util.Abort(_("cannot push --exact with applied patches")) | ||||
root = self.series[start] | ||||
target = patchheader(self.join(root), self.plainmode).parent | ||||
if not target: | ||||
|
r16231 | raise util.Abort( | ||
_("%s does not have a parent recorded") % root) | ||||
|
r13033 | if not repo[target] == repo['.']: | ||
hg.update(repo, target) | ||||
|
r11064 | if move: | ||
|
r11715 | if not patch: | ||
|
r13075 | raise util.Abort(_("please specify the patch to move")) | ||
|
r14572 | for i, rpn in enumerate(self.fullseries[start:]): | ||
|
r11715 | # strip markers for patch guards | ||
if self.guard_re.split(rpn, 1)[0] == patch: | ||||
break | ||||
index = start + i | ||||
|
r14572 | assert index < len(self.fullseries) | ||
fullpatch = self.fullseries[index] | ||||
del self.fullseries[index] | ||||
self.fullseries.insert(start, fullpatch) | ||||
|
r14575 | self.parseseries() | ||
|
r15879 | self.seriesdirty = True | ||
self.applieddirty = True | ||||
|
r4915 | if start > 0: | ||
|
r14581 | self.checktoppatch(repo) | ||
|
r4915 | if not patch: | ||
patch = self.series[start] | ||||
end = start + 1 | ||||
|
r4418 | else: | ||
|
r4915 | end = self.series.index(patch, start) + 1 | ||
|
r8875 | |||
|
r4915 | s = self.series[start:end] | ||
|
r10661 | all_files = set() | ||
|
r4915 | try: | ||
if mergeq: | ||||
|
r10184 | ret = self.mergepatch(repo, mergeq, s, diffopts) | ||
|
r4915 | else: | ||
|
r4917 | ret = self.apply(repo, s, list, all_files=all_files) | ||
|
r4915 | except: | ||
self.ui.warn(_('cleaning up working directory...')) | ||||
|
r13878 | node = repo.dirstate.p1() | ||
|
r4917 | hg.revert(repo, node, None) | ||
|
r4915 | # only remove unknown files that we know we touched or | ||
# created while patching | ||||
|
r10662 | for f in all_files: | ||
if f not in repo.dirstate: | ||||
|
r10693 | try: | ||
|
r13235 | util.unlinkpath(repo.wjoin(f)) | ||
|
r10693 | except OSError, inst: | ||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
|
r4915 | self.ui.warn(_('done\n')) | ||
raise | ||||
|
r8875 | |||
|
r9590 | if not self.applied: | ||
return ret[0] | ||||
|
r4915 | top = self.applied[-1].name | ||
|
r8875 | if ret[0] and ret[0] > 1: | ||
msg = _("errors during apply, please fix and refresh %s\n") | ||||
self.ui.write(msg % top) | ||||
|
r4915 | else: | ||
|
r7627 | self.ui.write(_("now at: %s\n") % top) | ||
|
r4915 | return ret[0] | ||
|
r8875 | |||
|
r4915 | finally: | ||
|
r8112 | wlock.release() | ||
|
r1808 | |||
|
r4917 | def pop(self, repo, patch=None, force=False, update=True, all=False): | ||
wlock = repo.wlock() | ||||
|
r4915 | try: | ||
if patch: | ||||
# index, rev, patch | ||||
info = self.isapplied(patch) | ||||
if not info: | ||||
patch = self.lookup(patch) | ||||
info = self.isapplied(patch) | ||||
if not info: | ||||
raise util.Abort(_("patch %s is not applied") % patch) | ||||
|
r4100 | |||
|
r10686 | if not self.applied: | ||
|
r4915 | # Allow qpop -a to work repeatedly, | ||
# but not qpop without an argument | ||||
self.ui.warn(_("no patches applied\n")) | ||||
return not all | ||||
|
r1808 | |||
|
r7620 | if all: | ||
start = 0 | ||||
elif patch: | ||||
start = info[0] + 1 | ||||
else: | ||||
start = len(self.applied) - 1 | ||||
if start >= len(self.applied): | ||||
self.ui.warn(_("qpop: %s is already at the top\n") % patch) | ||||
return | ||||
|
r4915 | if not update: | ||
parents = repo.dirstate.parents() | ||||
|
r10678 | rr = [x.node for x in self.applied] | ||
|
r4915 | for p in parents: | ||
if p in rr: | ||||
|
r6960 | self.ui.warn(_("qpop: forcing dirstate update\n")) | ||
|
r4915 | update = True | ||
|
r7621 | else: | ||
|
r10678 | parents = [p.node() for p in repo[None].parents()] | ||
|
r7621 | needupdate = False | ||
for entry in self.applied[start:]: | ||||
|
r10678 | if entry.node in parents: | ||
|
r7621 | needupdate = True | ||
break | ||||
update = needupdate | ||||
|
r1808 | |||
|
r14732 | if not force and update: | ||
self.checklocalchanges(repo) | ||||
|
r15879 | self.applieddirty = True | ||
|
r4915 | end = len(self.applied) | ||
|
r10678 | rev = self.applied[start].node | ||
|
r5980 | if update: | ||
|
r14581 | top = self.checktoppatch(repo)[0] | ||
|
r5980 | |||
|
r7621 | try: | ||
heads = repo.changelog.heads(rev) | ||||
|
r7639 | except error.LookupError: | ||
|
r7621 | node = short(rev) | ||
raise util.Abort(_('trying to pop unknown node %s') % node) | ||||
|
r10678 | if heads != [self.applied[-1].node]: | ||
|
r6960 | raise util.Abort(_("popping would remove a revision not " | ||
"managed by this patch queue")) | ||||
|
r16048 | if not repo[self.applied[-1].node].mutable(): | ||
raise util.Abort( | ||||
_("popping would remove an immutable revision"), | ||||
hint=_('see "hg help phases" for details')) | ||||
|
r5980 | |||
|
r4915 | # we know there are no local changes, so we can make a simplified | ||
# form of hg.update. | ||||
if update: | ||||
qp = self.qparents(repo, rev) | ||||
|
r10663 | ctx = repo[qp] | ||
|
r6760 | m, a, r, d = repo.status(qp, top)[:4] | ||
|
r4915 | if d: | ||
|
r6960 | raise util.Abort(_("deletions found between repo revs")) | ||
|
r4915 | for f in a: | ||
try: | ||||
|
r13235 | util.unlinkpath(repo.wjoin(f)) | ||
|
r4915 | except OSError, e: | ||
if e.errno != errno.ENOENT: | ||||
raise | ||||
|
r14434 | repo.dirstate.drop(f) | ||
|
r10048 | for f in m + r: | ||
|
r10663 | fctx = ctx[f] | ||
repo.wwrite(f, fctx.data(), fctx.flags()) | ||||
|
r10048 | repo.dirstate.normal(f) | ||
|
r7639 | repo.dirstate.setparents(qp, nullid) | ||
|
r9110 | for patch in reversed(self.applied[start:end]): | ||
|
r9111 | self.ui.status(_("popping %s\n") % patch.name) | ||
|
r5987 | del self.applied[start:end] | ||
|
r11789 | self.strip(repo, [rev], update=False, backup='strip') | ||
|
r10686 | if self.applied: | ||
|
r7627 | self.ui.write(_("now at: %s\n") % self.applied[-1].name) | ||
|
r4915 | else: | ||
|
r7627 | self.ui.write(_("patch queue now empty\n")) | ||
|
r4915 | finally: | ||
|
r8112 | wlock.release() | ||
|
r1808 | |||
|
r2937 | def diff(self, repo, pats, opts): | ||
|
r14581 | top, patch = self.checktoppatch(repo) | ||
|
r1808 | if not top: | ||
|
r7627 | self.ui.write(_("no patches applied\n")) | ||
|
r1808 | return | ||
qp = self.qparents(repo, top) | ||||
|
r9857 | if opts.get('reverse'): | ||
|
r9725 | node1, node2 = None, qp | ||
else: | ||||
node1, node2 = qp, None | ||||
|
r10191 | diffopts = self.diffopts(opts, patch) | ||
|
r10184 | self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts) | ||
|
r1808 | |||
|
r2938 | def refresh(self, repo, pats=None, **opts): | ||
|
r10686 | if not self.applied: | ||
|
r7627 | self.ui.write(_("no patches applied\n")) | ||
|
r3004 | return 1 | ||
|
r7399 | msg = opts.get('msg', '').rstrip() | ||
newuser = opts.get('user') | ||||
|
r6139 | newdate = opts.get('date') | ||
if newdate: | ||||
newdate = '%d %d' % util.parsedate(newdate) | ||||
|
r1808 | wlock = repo.wlock() | ||
|
r10366 | |||
|
r4915 | try: | ||
|
r14581 | self.checktoppatch(repo) | ||
|
r10678 | (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) | ||
|
r5980 | if repo.changelog.heads(top) != [top]: | ||
|
r6960 | raise util.Abort(_("cannot refresh a revision with children")) | ||
|
r16048 | if not repo[top].mutable(): | ||
raise util.Abort(_("cannot refresh immutable revision"), | ||||
hint=_('see "hg help phases" for details')) | ||||
|
r10366 | |||
|
r14582 | inclsubs = self.checksubstate(repo) | ||
|
r13174 | |||
|
r4915 | cparents = repo.changelog.parents(top) | ||
patchparent = self.qparents(repo, top) | ||||
|
r10397 | ph = patchheader(self.join(patchfn), self.plainmode) | ||
|
r10184 | diffopts = self.diffopts({'git': opts.get('git')}, patchfn) | ||
|
r7399 | if msg: | ||
ph.setmessage(msg) | ||||
|
r5673 | if newuser: | ||
|
r7399 | ph.setuser(newuser) | ||
|
r5788 | if newdate: | ||
|
r7399 | ph.setdate(newdate) | ||
|
r10397 | ph.setparent(hex(patchparent)) | ||
|
r5180 | |||
|
r7400 | # only commit new patch when write is complete | ||
patchf = self.opener(patchfn, 'w', atomictemp=True) | ||||
|
r7399 | comments = str(ph) | ||
|
r4915 | if comments: | ||
patchf.write(comments) | ||||
|
r1808 | |||
|
r10366 | # update the dirstate in place, strip off the qtip commit | ||
# and then commit. | ||||
# | ||||
# this should really read: | ||||
|
r13005 | # mm, dd, aa = repo.status(top, patchparent)[:3] | ||
|
r10366 | # but we do it backwards to take advantage of manifest/chlog | ||
# caching against the next repo.status call | ||||
|
r13004 | mm, aa, dd = repo.status(patchparent, top)[:3] | ||
|
r10366 | changes = repo.changelog.read(top) | ||
man = repo.manifest.read(changes[0]) | ||||
aaa = aa[:] | ||||
|
r14671 | matchfn = scmutil.match(repo[None], pats, opts) | ||
|
r10366 | # in short mode, we only diff the files included in the | ||
# patch already plus specified files | ||||
if opts.get('short'): | ||||
# if amending a patch, we start with existing | ||||
# files plus specified files - unfiltered | ||||
|
r14322 | match = scmutil.matchfiles(repo, mm + aa + dd + matchfn.files()) | ||
|
r10366 | # filter with inc/exl options | ||
|
r14671 | matchfn = scmutil.match(repo[None], opts=opts) | ||
|
r10366 | else: | ||
|
r14322 | match = scmutil.matchall(repo) | ||
|
r10366 | m, a, r, d = repo.status(match=match)[:4] | ||
|
r12948 | mm = set(mm) | ||
aa = set(aa) | ||||
dd = set(dd) | ||||
|
r1808 | |||
|
r10366 | # we might end up with files that were added between | ||
# qtip 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 | ||||
for x in m: | ||||
if x not in aa: | ||||
|
r12948 | mm.add(x) | ||
|
r10366 | # 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: | ||||
|
r12948 | dd.remove(x) | ||
mm.add(x) | ||||
|
r10366 | else: | ||
|
r12948 | aa.add(x) | ||
|
r10366 | # 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: | ||||
|
r12948 | aa.remove(x) | ||
|
r10366 | forget.append(x) | ||
continue | ||||
|
r12948 | else: | ||
mm.discard(x) | ||||
dd.add(x) | ||||
m = list(mm) | ||||
r = list(dd) | ||||
a = list(aa) | ||||
|
r10366 | c = [filter(matchfn, l) for l in (m, a, r)] | ||
|
r14322 | match = scmutil.matchfiles(repo, set(c[0] + c[1] + c[2] + inclsubs)) | ||
|
r14241 | chunks = patchmod.diff(repo, patchparent, match=match, | ||
|
r10366 | changes=c, opts=diffopts) | ||
for chunk in chunks: | ||||
patchf.write(chunk) | ||||
|
r1808 | |||
|
r10366 | try: | ||
|
r10368 | if diffopts.git or diffopts.upgrade: | ||
|
r10366 | copies = {} | ||
for dst in a: | ||||
src = repo.dirstate.copied(dst) | ||||
# during qfold, the source file for copies may | ||||
# be removed. Treat this as a simple add. | ||||
if src is not None and src in repo.dirstate: | ||||
copies.setdefault(src, []).append(dst) | ||||
repo.dirstate.add(dst) | ||||
# remember the copies between patchparent and qtip | ||||
for dst in aaa: | ||||
f = repo.file(dst) | ||||
src = f.renamed(man[dst]) | ||||
if src: | ||||
|
r10368 | copies.setdefault(src[0], []).extend( | ||
copies.get(dst, [])) | ||||
|
r10366 | 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) | ||||
else: | ||||
for dst in a: | ||||
repo.dirstate.add(dst) | ||||
# Drop useless copy information | ||||
for f in list(repo.dirstate.copies()): | ||||
repo.dirstate.copy(None, f) | ||||
for f in r: | ||||
repo.dirstate.remove(f) | ||||
# if the patch excludes a modified file, mark that | ||||
# file with mtime=0 so status can see it. | ||||
mm = [] | ||||
for i in xrange(len(m)-1, -1, -1): | ||||
if not matchfn(m[i]): | ||||
mm.append(m[i]) | ||||
del m[i] | ||||
for f in m: | ||||
repo.dirstate.normal(f) | ||||
for f in mm: | ||||
repo.dirstate.normallookup(f) | ||||
for f in forget: | ||||
|
r14434 | repo.dirstate.drop(f) | ||
|
r1808 | |||
|
r10366 | if not msg: | ||
if not ph.message: | ||||
message = "[mq]: %s\n" % patchfn | ||||
|
r4915 | else: | ||
|
r10366 | message = "\n".join(ph.message) | ||
else: | ||||
message = msg | ||||
|
r2694 | |||
|
r10366 | user = ph.user or changes[1] | ||
|
r5673 | |||
|
r16026 | oldphase = repo[top].phase() | ||
|
r10366 | # assumes strip can roll itself back if interrupted | ||
repo.dirstate.setparents(*cparents) | ||||
self.applied.pop() | ||||
|
r15879 | self.applieddirty = True | ||
|
r11789 | self.strip(repo, [top], update=False, | ||
|
r10366 | backup='strip') | ||
except: | ||||
repo.dirstate.invalidate() | ||||
raise | ||||
try: | ||||
# might be nice to attempt to roll back strip after this | ||||
|
r16100 | |||
# Ensure we create a new changeset in the same phase than | ||||
# the old one. | ||||
|
r16102 | n = newcommit(repo, oldphase, message, user, ph.date, | ||
match=match, force=True) | ||||
|
r13632 | # only write patch after a successful commit | ||
|
r15057 | patchf.close() | ||
|
r10678 | self.applied.append(statusentry(n, patchfn)) | ||
|
r10366 | except: | ||
ctx = repo[cparents[0]] | ||||
repo.dirstate.rebuild(ctx.node(), ctx.manifest()) | ||||
|
r14580 | self.savedirty() | ||
|
r10366 | self.ui.warn(_('refresh interrupted while patch was popped! ' | ||
'(revert --all, qpush to recover)\n')) | ||||
raise | ||||
|
r4915 | finally: | ||
|
r8112 | wlock.release() | ||
|
r7401 | self.removeundo(repo) | ||
|
r1808 | |||
def init(self, repo, create=False): | ||||
|
r4071 | if not create and os.path.isdir(self.path): | ||
|
r2712 | raise util.Abort(_("patch queue directory already exists")) | ||
|
r4071 | try: | ||
os.mkdir(self.path) | ||||
except OSError, inst: | ||||
if inst.errno != errno.EEXIST or not create: | ||||
raise | ||||
|
r1808 | 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: | ||
|
r14586 | start = self.seriesend() | ||
|
r1808 | 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])) | ||||
|
r14579 | self.explainpushable(i) | ||
|
r2821 | return unapplied | ||
|
r1810 | |||
|
r4239 | def qseries(self, repo, missing=None, start=0, length=None, status=None, | ||
|
r3183 | summary=False): | ||
|
r10824 | def displayname(pfx, patchname, state): | ||
|
r10932 | if pfx: | ||
self.ui.write(pfx) | ||||
|
r3183 | if summary: | ||
|
r10397 | ph = patchheader(self.join(patchname), self.plainmode) | ||
|
r9874 | msg = ph.message and ph.message[0] or '' | ||
|
r11327 | if self.ui.formatted(): | ||
|
r12689 | width = self.ui.termwidth() - len(pfx) - len(patchname) - 2 | ||
|
r9874 | if width > 0: | ||
msg = util.ellipsis(msg, width) | ||||
else: | ||||
msg = '' | ||||
|
r10932 | self.ui.write(patchname, label='qseries.' + state) | ||
self.ui.write(': ') | ||||
self.ui.write(msg, label='qseries.message.' + state) | ||||
|
r3183 | else: | ||
|
r10932 | self.ui.write(patchname, label='qseries.' + state) | ||
self.ui.write('\n') | ||||
|
r3183 | |||
|
r8152 | applied = set([p.name for p in self.applied]) | ||
|
r4239 | if length is None: | ||
|
r3183 | length = len(self.series) - start | ||
|
r1808 | if not missing: | ||
|
r9016 | if self.ui.verbose: | ||
|
r10282 | idxwidth = len(str(start + length - 1)) | ||
for i in xrange(start, start + length): | ||||
|
r4239 | patch = self.series[i] | ||
if patch in applied: | ||||
|
r10824 | char, state = 'A', 'applied' | ||
|
r4239 | elif self.pushable(i)[0]: | ||
|
r10824 | char, state = 'U', 'unapplied' | ||
|
r4239 | else: | ||
|
r10824 | char, state = 'G', 'guarded' | ||
|
r3183 | pfx = '' | ||
|
r1808 | if self.ui.verbose: | ||
|
r10824 | pfx = '%*d %s ' % (idxwidth, i, char) | ||
elif status and status != char: | ||||
|
r4238 | continue | ||
|
r10824 | displayname(pfx, patch, state) | ||
|
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 | ||
|
r14588 | fl not in (self.statuspath, self.seriespath, | ||
|
r14589 | self.guardspath) | ||
|
r1852 | and not fl.startswith('.')): | ||
|
r2794 | msng_list.append(fl) | ||
|
r8209 | for x in sorted(msng_list): | ||
|
r3183 | pfx = self.ui.verbose and ('D ') or '' | ||
|
r10824 | displayname(pfx, x, 'missing') | ||
|
r1808 | |||
def issaveline(self, l): | ||||
|
r2816 | if l.name == '.hg.patches.save.line': | ||
|
r1808 | return True | ||
def qrepo(self, create=False): | ||||
|
r11965 | ui = self.ui.copy() | ||
ui.setconfig('paths', 'default', '', overlay=False) | ||||
ui.setconfig('paths', 'default-push', '', overlay=False) | ||||
|
r2819 | if create or os.path.isdir(self.join(".hg")): | ||
|
r11965 | return hg.repository(ui, path=self.path, create=create) | ||
|
r1808 | |||
def restore(self, repo, rev, delete=None, qupdate=None): | ||||
|
r10681 | desc = repo[rev].description().strip() | ||
|
r1808 | lines = desc.splitlines() | ||
i = 0 | ||||
datastart = None | ||||
series = [] | ||||
applied = [] | ||||
qpp = None | ||||
|
r8632 | for i, line in enumerate(lines): | ||
if line == 'Patch Data:': | ||||
|
r1808 | datastart = i + 1 | ||
|
r8632 | elif line.startswith('Dirstate:'): | ||
l = line.rstrip() | ||||
|
r1808 | l = l[10:].split(' ') | ||
|
r10282 | qpp = [bin(x) for x in l] | ||
|
r13031 | elif datastart is not None: | ||
|
r8632 | l = line.rstrip() | ||
|
r10683 | n, name = l.split(':', 1) | ||
if n: | ||||
applied.append(statusentry(bin(n), name)) | ||||
|
r3185 | else: | ||
|
r10682 | series.append(l) | ||
|
r8527 | if datastart is None: | ||
|
r6960 | self.ui.warn(_("No saved patch data found\n")) | ||
|
r1808 | return 1 | ||
|
r6960 | self.ui.warn(_("restoring status: %s\n") % lines[0]) | ||
|
r14572 | self.fullseries = series | ||
|
r1808 | self.applied = applied | ||
|
r14575 | self.parseseries() | ||
|
r15879 | self.seriesdirty = True | ||
self.applieddirty = True | ||||
|
r1808 | heads = repo.changelog.heads() | ||
if delete: | ||||
if rev not in heads: | ||||
|
r6960 | self.ui.warn(_("save entry has children, leaving it alone\n")) | ||
|
r1808 | else: | ||
|
r6960 | self.ui.warn(_("removing save entry %s\n") % short(rev)) | ||
|
r1808 | pp = repo.dirstate.parents() | ||
if rev in pp: | ||||
update = True | ||||
else: | ||||
update = False | ||||
|
r11789 | self.strip(repo, [rev], update=update, backup='strip') | ||
|
r1808 | if qpp: | ||
|
r6960 | self.ui.warn(_("saved queue repository parents: %s %s\n") % | ||
|
r6217 | (short(qpp[0]), short(qpp[1]))) | ||
|
r1808 | if qupdate: | ||
|
r12848 | self.ui.status(_("updating queue directory\n")) | ||
|
r1808 | r = self.qrepo() | ||
if not r: | ||||
|
r6960 | self.ui.warn(_("Unable to load queue repository\n")) | ||
|
r1808 | return 1 | ||
|
r2808 | hg.clean(r, qpp[0]) | ||
|
r1808 | |||
def save(self, repo, msg=None): | ||||
|
r10686 | if not self.applied: | ||
|
r6960 | self.ui.warn(_("save: no patches applied, exiting\n")) | ||
|
r1808 | return 1 | ||
if self.issaveline(self.applied[-1]): | ||||
|
r6960 | self.ui.warn(_("status is already saved\n")) | ||
|
r1808 | return 1 | ||
|
r1810 | |||
|
r1808 | if not msg: | ||
|
r6960 | msg = _("hg patches saved state") | ||
|
r1808 | else: | ||
msg = "hg patches: " + msg.rstrip('\r\n') | ||||
r = self.qrepo() | ||||
if r: | ||||
pp = r.dirstate.parents() | ||||
|
r6217 | msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1])) | ||
|
r1808 | msg += "\n\nPatch Data:\n" | ||
|
r10679 | msg += ''.join('%s\n' % x for x in self.applied) | ||
|
r14572 | msg += ''.join(':%s\n' % x for x in self.fullseries) | ||
|
r10679 | n = repo.commit(msg, force=True) | ||
|
r1808 | if not n: | ||
|
r6960 | self.ui.warn(_("repo commit failed\n")) | ||
|
r1808 | return 1 | ||
|
r10684 | self.applied.append(statusentry(n, '.hg.patches.save.line')) | ||
|
r15879 | self.applieddirty = True | ||
|
r4209 | self.removeundo(repo) | ||
|
r1808 | |||
|
r14585 | def fullseriesend(self): | ||
|
r10686 | if self.applied: | ||
|
r2780 | p = self.applied[-1].name | ||
|
r14574 | end = self.findseries(p) | ||
|
r8527 | if end is None: | ||
|
r14572 | return len(self.fullseries) | ||
|
r2698 | return end + 1 | ||
return 0 | ||||
|
r14586 | def seriesend(self, all_patches=False): | ||
|
r4406 | """If all_patches is False, return the index of the next pushable patch | ||
in the series, or the series length. If all_patches is True, return the | ||||
index of the first patch past the last applied one. | ||||
""" | ||||
|
r1808 | end = 0 | ||
|
r2821 | def next(start): | ||
|
r10687 | if all_patches or start >= len(self.series): | ||
|
r2821 | return start | ||
|
r10687 | for i in xrange(start, len(self.series)): | ||
|
r2821 | p, reason = self.pushable(i) | ||
if p: | ||||
|
r16063 | return i | ||
|
r14579 | self.explainpushable(i) | ||
|
r16063 | return len(self.series) | ||
|
r10686 | if self.applied: | ||
|
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) | ||||
if rev: | ||||
if files: | ||||
raise util.Abort(_('option "-r" not valid when importing ' | ||||
'files')) | ||||
|
r14319 | rev = scmutil.revrange(repo, rev) | ||
|
r9032 | rev.sort(reverse=True) | ||
|
r3141 | if (len(files) > 1 or len(rev) > 1) and patchname: | ||
|
r2712 | raise util.Abort(_('option "-n" not valid when importing multiple ' | ||
|
r3141 | 'patches')) | ||
|
r16119 | imported = [] | ||
|
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: | ||||
|
r10678 | base = repo.changelog.node(rev[0]) | ||
if base in [n.node for n in self.applied]: | ||||
|
r3141 | raise util.Abort(_('revision %d is already managed') | ||
% rev[0]) | ||||
|
r10678 | if heads != [self.applied[-1].node]: | ||
|
r3141 | raise util.Abort(_('revision %d is not the parent of ' | ||
'the queue') % rev[0]) | ||||
|
r10678 | base = repo.changelog.rev(self.applied[0].node) | ||
|
r3141 | 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 | ||||
|
r10184 | diffopts = self.diffopts({'git': git}) | ||
|
r3141 | for r in rev: | ||
|
r15704 | if not repo[r].mutable(): | ||
raise util.Abort(_('revision %d is not mutable') % r, | ||||
hint=_('see "hg help phases" for details')) | ||||
|
r3141 | p1, p2 = repo.changelog.parentrevs(r) | ||
n = repo.changelog.node(r) | ||||
|
r7639 | if p2 != 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: | ||||
|
r4037 | patchname = normname('%d.diff' % r) | ||
|
r3141 | checkseries(patchname) | ||
|
r14423 | self.checkpatchname(patchname, force) | ||
|
r14572 | self.fullseries.insert(0, patchname) | ||
|
r3141 | |||
patchf = self.opener(patchname, "w") | ||||
|
r10611 | cmdutil.export(repo, [n], fp=patchf, opts=diffopts) | ||
|
r3141 | patchf.close() | ||
|
r10678 | se = statusentry(n, patchname) | ||
|
r3141 | self.applied.insert(0, se) | ||
|
r11462 | self.added.append(patchname) | ||
|
r16119 | imported.append(patchname) | ||
|
r3141 | patchname = None | ||
|
r16027 | if rev and repo.ui.configbool('mq', 'secret', False): | ||
# if we added anything with --rev, we must move the secret root | ||||
phases.retractboundary(repo, phases.secret, [n]) | ||||
|
r14575 | self.parseseries() | ||
|
r15879 | self.applieddirty = True | ||
|
r14593 | self.seriesdirty = True | ||
|
r3141 | |||
|
r10687 | for i, filename in enumerate(files): | ||
|
r1808 | if existing: | ||
|
r3547 | if filename == '-': | ||
raise util.Abort(_('-e is incompatible with import from -')) | ||||
|
r11699 | filename = normname(filename) | ||
|
r14584 | self.checkreservedname(filename) | ||
|
r11699 | originpath = self.join(filename) | ||
if not os.path.isfile(originpath): | ||||
raise util.Abort(_("patch %s does not exist") % filename) | ||||
if patchname: | ||||
|
r14423 | self.checkpatchname(patchname, force) | ||
|
r11699 | |||
self.ui.write(_('renaming %s to %s\n') | ||||
% (filename, patchname)) | ||||
|
r11701 | util.rename(originpath, self.join(patchname)) | ||
|
r11699 | else: | ||
patchname = filename | ||||
|
r1808 | else: | ||
|
r14395 | if filename == '-' and not patchname: | ||
raise util.Abort(_('need --name to import a patch from -')) | ||||
elif not patchname: | ||||
|
r14396 | patchname = normname(os.path.basename(filename.rstrip('/'))) | ||
|
r14423 | self.checkpatchname(patchname, force) | ||
|
r1808 | try: | ||
|
r3547 | if filename == '-': | ||
|
r14636 | text = self.ui.fin.read() | ||
|
r3547 | else: | ||
|
r13400 | fp = url.open(self.ui, filename) | ||
text = fp.read() | ||||
fp.close() | ||||
|
r7421 | except (OSError, IOError): | ||
|
r11709 | raise util.Abort(_("unable to read file %s") % filename) | ||
|
r3133 | patchf = self.opener(patchname, "w") | ||
|
r1808 | patchf.write(text) | ||
|
r13400 | patchf.close() | ||
|
r7160 | if not force: | ||
checkseries(patchname) | ||||
if patchname not in self.series: | ||||
|
r14585 | index = self.fullseriesend() + i | ||
|
r14572 | self.fullseries[index:index] = [patchname] | ||
|
r14575 | self.parseseries() | ||
|
r14593 | self.seriesdirty = True | ||
|
r7597 | self.ui.warn(_("adding %s to series file\n") % patchname) | ||
|
r11462 | self.added.append(patchname) | ||
|
r16119 | imported.append(patchname) | ||
|
r3133 | patchname = None | ||
|
r1808 | |||
|
r13409 | self.removeundo(repo) | ||
|
r16119 | return imported | ||
|
r13409 | |||
|
r14298 | @command("qdelete|qremove|qrm", | ||
[('k', 'keep', None, _('keep patch file')), | ||||
('r', 'rev', [], | ||||
_('stop managing a revision (DEPRECATED)'), _('REV'))], | ||||
_('hg qdelete [-k] [PATCH]...')) | ||||
|
r3373 | def delete(ui, repo, *patches, **opts): | ||
|
r2905 | """remove patches from queue | ||
|
r2752 | |||
|
r15798 | The patches must not be applied, and at least one patch is required. Exact | ||
patch identifiers must be given. With -k/--keep, the patch files are | ||||
preserved in the patch directory. | ||||
|
r8904 | |||
To stop managing a patch and move it into permanent history, | ||||
|
r11307 | use the :hg:`qfinish` command.""" | ||
|
r2724 | q = repo.mq | ||
|
r3373 | q.delete(repo, patches, opts) | ||
|
r14580 | q.savedirty() | ||
|
r1808 | return 0 | ||
|
r14298 | @command("qapplied", | ||
|
r16188 | [('1', 'last', None, _('show only the preceding applied patch')) | ||
|
r14298 | ] + seriesopts, | ||
_('hg qapplied [-1] [-s] [PATCH]')) | ||||
|
r1808 | def applied(ui, repo, patch=None, **opts): | ||
|
r12538 | """print the patches already applied | ||
Returns 0 on success.""" | ||||
|
r9364 | |||
|
r3183 | q = repo.mq | ||
|
r9364 | |||
|
r3183 | 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: | ||||
|
r14586 | end = q.seriesend(True) | ||
|
r9364 | |||
if opts.get('last') and not end: | ||||
ui.write(_("no patches applied\n")) | ||||
return 1 | ||||
elif opts.get('last') and end == 1: | ||||
ui.write(_("only one patch applied\n")) | ||||
return 1 | ||||
elif opts.get('last'): | ||||
start = end - 2 | ||||
end = 1 | ||||
else: | ||||
start = 0 | ||||
|
r12539 | q.qseries(repo, length=end, start=start, status='A', | ||
summary=opts.get('summary')) | ||||
|
r1808 | |||
|
r14298 | @command("qunapplied", | ||
[('1', 'first', None, _('show only the first patch'))] + seriesopts, | ||||
_('hg qunapplied [-1] [-s] [PATCH]')) | ||||
|
r1808 | def unapplied(ui, repo, patch=None, **opts): | ||
|
r12538 | """print the patches not yet applied | ||
Returns 0 on success.""" | ||||
|
r9364 | |||
|
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: | ||||
|
r14586 | start = q.seriesend(True) | ||
|
r9364 | |||
if start == len(q.series) and opts.get('first'): | ||||
ui.write(_("all patches applied\n")) | ||||
return 1 | ||||
length = opts.get('first') and 1 or None | ||||
|
r12539 | q.qseries(repo, start=start, length=length, status='U', | ||
summary=opts.get('summary')) | ||||
|
r1808 | |||
|
r14298 | @command("qimport", | ||
[('e', 'existing', None, _('import file in patch directory')), | ||||
('n', 'name', '', | ||||
_('name of patch file'), _('NAME')), | ||||
('f', 'force', None, _('overwrite existing files')), | ||||
('r', 'rev', [], | ||||
_('place existing revisions under mq control'), _('REV')), | ||||
('g', 'git', None, _('use git extended diff format')), | ||||
('P', 'push', None, _('qpush after importing'))], | ||||
_('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')) | ||||
|
r1808 | def qimport(ui, repo, *filename, **opts): | ||
|
r16152 | """import a patch or existing changeset | ||
|
r3141 | |||
|
r7994 | The patch is inserted into the series after the last applied | ||
patch. If no patches have been applied, qimport prepends the patch | ||||
|
r6634 | to the series. | ||
|
r3141 | The patch will have the same name as its source file unless you | ||
|
r8076 | give it a new one with -n/--name. | ||
|
r3141 | |||
|
r7994 | You can register an existing patch inside the patch directory with | ||
|
r8076 | the -e/--existing flag. | ||
|
r3141 | |||
|
r8076 | With -f/--force, an existing patch of the same name will be | ||
|
r7994 | overwritten. | ||
|
r3141 | |||
|
r8076 | An existing changeset may be placed under mq control with -r/--rev | ||
|
r3141 | (e.g. qimport --rev tip -n patch will place tip under mq control). | ||
|
r8076 | With -g/--git, patches imported with --rev will use the git diff | ||
|
r7387 | format. See the diffs help topic for information on why this is | ||
|
r7994 | important for preserving rename/copy information and permission | ||
|
r13528 | changes. Use :hg:`qfinish` to remove changesets from mq control. | ||
|
r8075 | |||
To import a patch from standard input, pass - as the patch file. | ||||
When importing from standard input, a patch name must be specified | ||||
using the --name flag. | ||||
|
r11700 | |||
|
r11706 | To import an existing patch while renaming it:: | ||
|
r11700 | |||
hg qimport -e existing-patch -n new-name | ||||
|
r12538 | |||
Returns 0 if import succeeded. | ||||
|
r3141 | """ | ||
|
r16027 | lock = repo.lock() # cause this may move phase | ||
|
r11462 | try: | ||
|
r16027 | q = repo.mq | ||
try: | ||||
|
r16119 | imported = q.qimport( | ||
repo, filename, patchname=opts.get('name'), | ||||
existing=opts.get('existing'), force=opts.get('force'), | ||||
rev=opts.get('rev'), git=opts.get('git')) | ||||
|
r16027 | finally: | ||
q.savedirty() | ||||
|
r16119 | if imported and opts.get('push') and not opts.get('rev'): | ||
return q.push(repo, imported[-1]) | ||||
|
r11462 | finally: | ||
|
r16027 | lock.release() | ||
|
r1808 | return 0 | ||
|
r10480 | def qinit(ui, repo, create): | ||
"""initialize a new queue repository | ||||
|
r2754 | |||
|
r10480 | This command also creates a series file for ordering patches, and | ||
an mq-specific .hgignore file in the queue repository, to exclude | ||||
|
r12538 | the status and guards files (these contain mostly transient state). | ||
Returns 0 if initialization succeeded.""" | ||||
|
r2724 | q = repo.mq | ||
|
r10480 | r = q.init(repo, create) | ||
|
r14580 | q.savedirty() | ||
|
r1808 | if r: | ||
|
r4071 | if not os.path.exists(r.wjoin('.hgignore')): | ||
fp = r.wopener('.hgignore', 'w') | ||||
|
r6034 | fp.write('^\\.hg\n') | ||
fp.write('^\\.mq\n') | ||||
|
r4071 | fp.write('syntax: glob\n') | ||
fp.write('status\n') | ||||
fp.write('guards\n') | ||||
fp.close() | ||||
if not os.path.exists(r.wjoin('series')): | ||||
r.wopener('series', 'w').close() | ||||
|
r11303 | r[None].add(['.hgignore', 'series']) | ||
|
r4071 | commands.add(ui, r) | ||
|
r1808 | return 0 | ||
|
r14298 | @command("^qinit", | ||
[('c', 'create-repo', None, _('create queue repository'))], | ||||
_('hg qinit [-c]')) | ||||
|
r10480 | def init(ui, repo, **opts): | ||
"""init a new queue repository (DEPRECATED) | ||||
The queue repository is unversioned by default. If | ||||
-c/--create-repo is specified, qinit will create a separate nested | ||||
repository for patches (qinit -c may also be run later to convert | ||||
an unversioned patch repository into a versioned one). You can use | ||||
qcommit to commit changes to this queue repository. | ||||
This command is deprecated. Without -c, it's implied by other relevant | ||||
|
r11193 | commands. With -c, use :hg:`init --mq` instead.""" | ||
|
r12281 | return qinit(ui, repo, create=opts.get('create_repo')) | ||
|
r10480 | |||
|
r14298 | @command("qclone", | ||
[('', '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)')), | ||||
('p', 'patches', '', | ||||
_('location of source patch repository'), _('REPO')), | ||||
] + commands.remoteopts, | ||||
_('hg qclone [OPTION]... SOURCE [DEST]')) | ||||
|
r2720 | def clone(ui, source, dest=None, **opts): | ||
'''clone main and patch repository at same time | ||||
|
r7983 | If source is local, destination will have no patches applied. If | ||
|
r2720 | source is remote, this command can not check if patches are | ||
applied in source, so cannot guarantee that patches are not | ||||
|
r7983 | applied in destination. If you clone remote repository, be sure | ||
|
r2720 | before that it has no patches applied. | ||
Source patch repository is looked for in <src>/.hg/patches by | ||||
|
r7983 | default. Use -p <url> to change. | ||
|
r4862 | |||
|
r8760 | The patch directory must be a nested Mercurial repository, as | ||
|
r11193 | would be created by :hg:`init --mq`. | ||
|
r12538 | |||
Return 0 on success. | ||||
|
r2720 | ''' | ||
|
r5226 | def patchdir(repo): | ||
|
r15921 | """compute a patch repo url from a repo object""" | ||
|
r5226 | url = repo.url() | ||
if url.endswith('/'): | ||||
url = url[:-1] | ||||
return url + '/.hg/patches' | ||||
|
r15921 | |||
# main repo (destination and sources) | ||||
|
r2720 | if dest is None: | ||
dest = hg.defaultdest(source) | ||||
|
r11273 | sr = hg.repository(hg.remoteui(ui, opts), ui.expandpath(source)) | ||
|
r15921 | |||
# patches repo (source only) | ||||
|
r12281 | if opts.get('patches'): | ||
patchespath = ui.expandpath(opts.get('patches')) | ||||
|
r7729 | else: | ||
patchespath = patchdir(sr) | ||||
|
r4862 | try: | ||
|
r7874 | hg.repository(ui, patchespath) | ||
|
r7637 | except error.RepoError: | ||
|
r4862 | raise util.Abort(_('versioned patch repository not found' | ||
|
r10690 | ' (see init --mq)')) | ||
|
r2720 | qbase, destrev = None, None | ||
if sr.local(): | ||||
|
r15924 | if sr.mq.applied and sr[qbase].phase() != phases.secret: | ||
|
r10678 | qbase = sr.mq.applied[0].node | ||
|
r2720 | if not hg.islocal(dest): | ||
|
r8152 | heads = set(sr.heads()) | ||
destrev = list(heads.difference(sr.heads(qbase))) | ||||
|
r4171 | destrev.append(sr.changelog.parents(qbase)[0]) | ||
|
r6164 | elif sr.capable('lookup'): | ||
|
r6380 | try: | ||
qbase = sr.lookup('qbase') | ||||
|
r7637 | except error.RepoError: | ||
|
r6380 | pass | ||
|
r15921 | |||
|
r8027 | ui.note(_('cloning main repository\n')) | ||
|
r14553 | sr, dr = hg.clone(ui, opts, sr.url(), dest, | ||
|
r12281 | pull=opts.get('pull'), | ||
|
r2720 | rev=destrev, | ||
update=False, | ||||
|
r12281 | stream=opts.get('uncompressed')) | ||
|
r15921 | |||
|
r8027 | ui.note(_('cloning patch repository\n')) | ||
|
r14553 | hg.clone(ui, opts, opts.get('patches') or patchdir(sr), patchdir(dr), | ||
|
r12281 | pull=opts.get('pull'), update=not opts.get('noupdate'), | ||
stream=opts.get('uncompressed')) | ||||
|
r15921 | |||
|
r2720 | if dr.local(): | ||
if qbase: | ||||
|
r8027 | ui.note(_('stripping applied patches from destination ' | ||
'repository\n')) | ||||
|
r11789 | dr.mq.strip(dr, [qbase], update=False, backup=None) | ||
|
r12281 | if not opts.get('noupdate'): | ||
|
r8027 | ui.note(_('updating destination repository\n')) | ||
|
r2775 | hg.update(dr, dr.changelog.tip()) | ||
|
r2720 | |||
|
r14298 | @command("qcommit|qci", | ||
commands.table["^commit|ci"][1], | ||||
_('hg qcommit [OPTION]... [FILE]...')) | ||||
|
r1808 | def commit(ui, repo, *pats, **opts): | ||
|
r10361 | """commit changes in the queue repository (DEPRECATED) | ||
|
r11193 | This command is deprecated; use :hg:`commit --mq` instead.""" | ||
|
r2724 | q = repo.mq | ||
|
r1808 | r = q.qrepo() | ||
|
r10282 | if not r: | ||
raise util.Abort('no queue repository') | ||||
|
r1808 | commands.commit(r.ui, r, *pats, **opts) | ||
|
r14298 | @command("qseries", | ||
[('m', 'missing', None, _('print patches not in series')), | ||||
] + seriesopts, | ||||
_('hg qseries [-ms]')) | ||||
|
r1808 | def series(ui, repo, **opts): | ||
|
r12538 | """print the entire series file | ||
Returns 0 on success.""" | ||||
|
r12281 | repo.mq.qseries(repo, missing=opts.get('missing'), summary=opts.get('summary')) | ||
|
r1808 | return 0 | ||
|
r14468 | @command("qtop", seriesopts, _('hg qtop [-s]')) | ||
|
r1808 | def top(ui, repo, **opts): | ||
|
r12538 | """print the name of the current patch | ||
Returns 0 on success.""" | ||||
|
r3183 | q = repo.mq | ||
|
r14586 | t = q.applied and q.seriesend(True) or 0 | ||
|
r3183 | if t: | ||
|
r12539 | q.qseries(repo, start=t - 1, length=1, status='A', | ||
summary=opts.get('summary')) | ||||
|
r3183 | else: | ||
|
r7627 | ui.write(_("no patches applied\n")) | ||
|
r3183 | return 1 | ||
|
r1808 | |||
|
r14468 | @command("qnext", seriesopts, _('hg qnext [-s]')) | ||
|
r1808 | def next(ui, repo, **opts): | ||
|
r16063 | """print the name of the next pushable patch | ||
|
r12538 | |||
Returns 0 on success.""" | ||||
|
r3183 | q = repo.mq | ||
|
r14586 | end = q.seriesend() | ||
|
r3183 | if end == len(q.series): | ||
|
r7627 | ui.write(_("all patches applied\n")) | ||
|
r3183 | return 1 | ||
|
r12539 | q.qseries(repo, start=end, length=1, summary=opts.get('summary')) | ||
|
r1808 | |||
|
r14468 | @command("qprev", seriesopts, _('hg qprev [-s]')) | ||
|
r1808 | def prev(ui, repo, **opts): | ||
|
r16188 | """print the name of the preceding applied patch | ||
|
r12538 | |||
Returns 0 on success.""" | ||||
|
r3183 | q = repo.mq | ||
l = len(q.applied) | ||||
if l == 1: | ||||
|
r7627 | ui.write(_("only one patch applied\n")) | ||
|
r3183 | return 1 | ||
if not l: | ||||
|
r7627 | ui.write(_("no patches applied\n")) | ||
|
r3183 | return 1 | ||
|
r16064 | idx = q.series.index(q.applied[-2].name) | ||
q.qseries(repo, start=idx, length=1, status='A', | ||||
|
r12539 | summary=opts.get('summary')) | ||
|
r1808 | |||
|
r5673 | def setupheaderopts(ui, opts): | ||
|
r9733 | if not opts.get('user') and opts.get('currentuser'): | ||
opts['user'] = ui.username() | ||||
if not opts.get('date') and opts.get('currentdate'): | ||||
opts['date'] = "%d %d" % util.makedate() | ||||
|
r5673 | |||
|
r14298 | @command("^qnew", | ||
[('e', 'edit', None, _('edit commit message')), | ||||
('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), | ||||
('g', 'git', None, _('use git extended diff format')), | ||||
('U', 'currentuser', None, _('add "From: <current user>" to patch')), | ||||
('u', 'user', '', | ||||
_('add "From: <USER>" to patch'), _('USER')), | ||||
('D', 'currentdate', None, _('add "Date: <current date>" to patch')), | ||||
('d', 'date', '', | ||||
_('add "Date: <DATE>" to patch'), _('DATE')) | ||||
] + commands.walkopts + commands.commitopts, | ||||
_('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')) | ||||
|
r4713 | def new(ui, repo, patch, *args, **opts): | ||
|
r2754 | """create a new patch | ||
|
r7994 | qnew creates a new patch on top of the currently-applied patch (if | ||
|
r10808 | any). The patch will be initialized with any outstanding changes | ||
in the working directory. You may also use -I/--include, | ||||
|
r8076 | -X/--exclude, and/or a list of files after the patch name to add | ||
only changes to matching files to the new patch, leaving the rest | ||||
as uncommitted modifications. | ||||
|
r2754 | |||
|
r8076 | -u/--user and -d/--date can be used to set the (given) user and | ||
date, respectively. -U/--currentuser and -D/--currentdate set user | ||||
to current user and date to current date. | ||||
|
r7306 | |||
|
r8076 | -e/--edit, -m/--message or -l/--logfile set the patch header as | ||
well as the commit message. If none is specified, the header is | ||||
empty and the commit message is '[mq]: PATCH'. | ||||
|
r7307 | |||
|
r8076 | Use the -g/--git option to keep the patch in the git extended diff | ||
|
r7387 | format. Read the diffs help topic for more information on why this | ||
is important for preserving permission changes and copy/rename | ||||
information. | ||||
|
r12538 | |||
Returns 0 on successful creation of a new patch. | ||||
|
r7306 | """ | ||
|
r14635 | msg = cmdutil.logmessage(ui, opts) | ||
|
r10282 | def getmsg(): | ||
|
r12281 | return ui.edit(msg, opts.get('user') or ui.username()) | ||
|
r2724 | q = repo.mq | ||
|
r7157 | opts['msg'] = msg | ||
if opts.get('edit'): | ||||
opts['msg'] = getmsg | ||||
else: | ||||
opts['msg'] = msg | ||||
|
r5673 | setupheaderopts(ui, opts) | ||
|
r4713 | q.new(repo, patch, *args, **opts) | ||
|
r14580 | q.savedirty() | ||
|
r1808 | return 0 | ||
|
r14298 | @command("^qrefresh", | ||
[('e', 'edit', None, _('edit commit message')), | ||||
('g', 'git', None, _('use git extended diff format')), | ||||
('s', 'short', None, | ||||
_('refresh only files already in the patch and specified files')), | ||||
('U', 'currentuser', None, | ||||
_('add/update author field in patch with current user')), | ||||
('u', 'user', '', | ||||
_('add/update author field in patch with given user'), _('USER')), | ||||
('D', 'currentdate', None, | ||||
_('add/update date field in patch with current date')), | ||||
('d', 'date', '', | ||||
_('add/update date field in patch with given date'), _('DATE')) | ||||
] + commands.walkopts + commands.commitopts, | ||||
_('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')) | ||||
|
r2938 | def refresh(ui, repo, *pats, **opts): | ||
|
r2940 | """update the current patch | ||
|
r7994 | 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. | ||||
|
r4048 | |||
|
r8076 | If -s/--short is specified, files currently included in the patch | ||
|
r7994 | will be refreshed just like matched files and remain in the patch. | ||
|
r7113 | |||
|
r11947 | If -e/--edit is specified, Mercurial will start your configured editor for | ||
you to enter a message. In case qrefresh fails, you will find a backup of | ||||
your message in ``.hg/last-message.txt``. | ||||
|
r7994 | hg add/remove/copy/rename work as usual, though you might want to | ||
|
r8076 | use git-style patches (-g/--git or [diff] git=1) to track copies | ||
and renames. See the diffs help topic for more information on the | ||||
git diff format. | ||||
|
r12538 | |||
Returns 0 on success. | ||||
|
r2940 | """ | ||
|
r2724 | q = repo.mq | ||
|
r14635 | message = cmdutil.logmessage(ui, opts) | ||
|
r12281 | if opts.get('edit'): | ||
|
r5334 | if not q.applied: | ||
|
r7627 | ui.write(_("no patches applied\n")) | ||
|
r5334 | return 1 | ||
|
r2746 | if message: | ||
raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | ||||
|
r2780 | patch = q.applied[-1].name | ||
|
r10397 | ph = patchheader(q.join(patch), q.plainmode) | ||
|
r7399 | message = ui.edit('\n'.join(ph.message), ph.user or ui.username()) | ||
|
r11947 | # We don't want to lose the patch message if qrefresh fails (issue2062) | ||
|
r14529 | repo.savecommitmessage(message) | ||
|
r5673 | setupheaderopts(ui, opts) | ||
|
r14620 | wlock = repo.wlock() | ||
try: | ||||
ret = q.refresh(repo, pats, msg=message, **opts) | ||||
q.savedirty() | ||||
return ret | ||||
finally: | ||||
wlock.release() | ||||
|
r1808 | |||
|
r14298 | @command("^qdiff", | ||
commands.diffopts + commands.diffopts2 + commands.walkopts, | ||||
_('hg qdiff [OPTION]... [FILE]...')) | ||||
|
r2937 | def diff(ui, repo, *pats, **opts): | ||
|
r6606 | """diff of the current patch and subsequent modifications | ||
|
r6621 | |||
|
r7994 | Shows a diff which includes the current patch as well as any | ||
changes which have been made in the working directory since the | ||||
last refresh (thus showing what the current patch would become | ||||
after a qrefresh). | ||||
|
r6621 | |||
|
r10973 | Use :hg:`diff` if you only want to see the changes made since the | ||
last qrefresh, or :hg:`export qtip` if you want to see changes | ||||
made by the current patch without including changes made since the | ||||
|
r7994 | qrefresh. | ||
|
r12538 | |||
Returns 0 on success. | ||||
|
r6606 | """ | ||
|
r2937 | repo.mq.diff(repo, pats, opts) | ||
|
r1808 | return 0 | ||
|
r14298 | @command('qfold', | ||
[('e', 'edit', None, _('edit patch header')), | ||||
('k', 'keep', None, _('keep folded patch files')), | ||||
] + commands.commitopts, | ||||
_('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')) | ||||
|
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 | ||||
|
r7994 | with the new cumulative patch, and the folded patches will be | ||
deleted. With -k/--keep, the folded patch files will not be | ||||
removed afterwards. | ||||
|
r2771 | |||
|
r7994 | The header for each folded patch will be concatenated with the | ||
|
r12755 | current patch header, separated by a line of ``* * *``. | ||
|
r12538 | |||
Returns 0 on success.""" | ||||
|
r2748 | q = repo.mq | ||
if not files: | ||||
raise util.Abort(_('qfold requires at least one patch name')) | ||||
|
r14581 | if not q.checktoppatch(repo)[0]: | ||
|
r12067 | raise util.Abort(_('no patches applied')) | ||
|
r14583 | q.checklocalchanges(repo) | ||
|
r2748 | |||
|
r14635 | message = cmdutil.logmessage(ui, opts) | ||
|
r12281 | if opts.get('edit'): | ||
|
r2753 | 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: | ||||
|
r12208 | ui.warn(_('Skipping already folded patch %s\n') % p) | ||
|
r2936 | 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: | ||
|
r10397 | ph = patchheader(q.join(p), q.plainmode) | ||
|
r7454 | if ph.message: | ||
messages.append(ph.message) | ||||
|
r2936 | pf = q.join(p) | ||
|
r2748 | (patchsuccess, files, fuzz) = q.patch(repo, pf) | ||
if not patchsuccess: | ||||
|
r12067 | raise util.Abort(_('error folding patch %s') % p) | ||
|
r2748 | |||
|
r2753 | if not message: | ||
|
r10397 | ph = patchheader(q.join(parent), q.plainmode) | ||
|
r7399 | message, user = ph.message, ph.user | ||
|
r2753 | for msg in messages: | ||
message.append('* * *') | ||||
message.extend(msg) | ||||
message = '\n'.join(message) | ||||
|
r12281 | if opts.get('edit'): | ||
|
r2753 | message = ui.edit(message, user or ui.username()) | ||
|
r2748 | |||
|
r10186 | diffopts = q.patchopts(q.diffopts(), *patches) | ||
|
r14620 | wlock = repo.wlock() | ||
try: | ||||
q.refresh(repo, msg=message, git=diffopts.git) | ||||
q.delete(repo, patches, opts) | ||||
q.savedirty() | ||||
finally: | ||||
wlock.release() | ||||
|
r2748 | |||
|
r14298 | @command("qgoto", | ||
[('f', 'force', None, _('overwrite any local changes'))], | ||||
_('hg qgoto [OPTION]... PATCH')) | ||||
|
r4432 | def goto(ui, repo, patch, **opts): | ||
|
r12538 | '''push or pop patches until named patch is at top of stack | ||
Returns 0 on success.''' | ||||
|
r4432 | q = repo.mq | ||
patch = q.lookup(patch) | ||||
if q.isapplied(patch): | ||||
|
r12281 | ret = q.pop(repo, patch, force=opts.get('force')) | ||
|
r4432 | else: | ||
|
r12281 | ret = q.push(repo, patch, force=opts.get('force')) | ||
|
r14580 | q.savedirty() | ||
|
r4432 | return ret | ||
|
r14298 | @command("qguard", | ||
[('l', 'list', None, _('list all patches and guards')), | ||||
('n', 'none', None, _('drop all guards'))], | ||||
_('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]')) | ||||
|
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 | ||||
|
r11307 | pushed only if the :hg:`qselect` command has activated it. A patch with | ||
a negative guard ("-foo") is never pushed if the :hg:`qselect` command | ||||
|
r2940 | has activated it. | ||
|
r2821 | |||
|
r2940 | With no arguments, print the currently active guards. | ||
With arguments, set guards for the named patch. | ||||
|
r12389 | |||
.. note:: | ||||
Specifying negative guards now requires '--'. | ||||
|
r2821 | |||
|
r9824 | To set guards on another patch:: | ||
|
r10476 | hg qguard other.patch -- +2.6.17 -stable | ||
|
r12538 | |||
Returns 0 on success. | ||||
|
r2821 | ''' | ||
def status(idx): | ||||
|
r14573 | guards = q.seriesguards[idx] or ['unguarded'] | ||
|
r11819 | if q.series[idx] in applied: | ||
state = 'applied' | ||||
elif q.pushable(idx)[0]: | ||||
state = 'unapplied' | ||||
else: | ||||
state = 'guarded' | ||||
label = 'qguard.patch qguard.%s qseries.%s' % (state, state) | ||||
ui.write('%s: ' % ui.label(q.series[idx], label)) | ||||
|
r10822 | for i, guard in enumerate(guards): | ||
if guard.startswith('+'): | ||||
|
r11310 | ui.write(guard, label='qguard.positive') | ||
|
r10822 | elif guard.startswith('-'): | ||
|
r11310 | ui.write(guard, label='qguard.negative') | ||
|
r10822 | else: | ||
|
r11310 | ui.write(guard, label='qguard.unguarded') | ||
|
r10822 | if i != len(guards) - 1: | ||
|
r11310 | ui.write(' ') | ||
ui.write('\n') | ||||
|
r2821 | q = repo.mq | ||
|
r11819 | applied = set(p.name for p in q.applied) | ||
|
r2821 | patch = None | ||
args = list(args) | ||||
|
r12281 | if opts.get('list'): | ||
if args or opts.get('none'): | ||||
|
r2821 | 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')) | ||||
|
r12281 | if args or opts.get('none'): | ||
|
r14574 | idx = q.findseries(patch) | ||
|
r4133 | if idx is None: | ||
raise util.Abort(_('no patch named %s') % patch) | ||||
|
r14577 | q.setguards(idx, args) | ||
|
r14580 | q.savedirty() | ||
|
r2821 | else: | ||
status(q.series.index(q.lookup(patch))) | ||||
|
r14298 | @command("qheader", [], _('hg qheader [PATCH]')) | ||
|
r2747 | def header(ui, repo, patch=None): | ||
|
r12538 | """print the header of the topmost or specified patch | ||
Returns 0 on success.""" | ||||
|
r2747 | q = repo.mq | ||
if patch: | ||||
patch = q.lookup(patch) | ||||
else: | ||||
if not q.applied: | ||||
|
r10510 | ui.write(_('no patches applied\n')) | ||
|
r3008 | return 1 | ||
|
r2747 | patch = q.lookup('qtip') | ||
|
r10397 | ph = patchheader(q.join(patch), q.plainmode) | ||
|
r2747 | |||
|
r7399 | ui.write('\n'.join(ph.message) + '\n') | ||
|
r2747 | |||
|
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)) | ||||
|
r8527 | if maxindex is None or index > maxindex: | ||
|
r2794 | 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 | ||||
|
r14298 | @command("^qpush", | ||
[('f', 'force', None, _('apply on top of local changes')), | ||||
('e', 'exact', None, _('apply the target patch to its recorded parent')), | ||||
('l', 'list', None, _('list patch name in commit text')), | ||||
('a', 'all', None, _('apply all patches')), | ||||
('m', 'merge', None, _('merge from another queue (DEPRECATED)')), | ||||
('n', 'name', '', | ||||
_('merge queue name (DEPRECATED)'), _('NAME')), | ||||
('', 'move', None, _('reorder patch series and apply only the patch'))], | ||||
_('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]')) | ||||
|
r1808 | def push(ui, repo, patch=None, **opts): | ||
|
r6552 | """push the next patch onto the stack | ||
|
r6553 | |||
|
r8076 | When -f/--force is applied, all local changes in patched files | ||
will be lost. | ||||
|
r12538 | |||
|
r13725 | Return 0 on success. | ||
|
r6552 | """ | ||
|
r2724 | q = repo.mq | ||
|
r1808 | mergeq = None | ||
|
r1810 | |||
|
r12281 | if opts.get('merge'): | ||
if opts.get('name'): | ||||
newpath = repo.join(opts.get('name')) | ||||
|
r1808 | else: | ||
|
r1810 | newpath, i = lastsavename(q.path) | ||
|
r1808 | if not newpath: | ||
|
r6960 | ui.warn(_("no saved queues found, please use -n\n")) | ||
|
r1808 | return 1 | ||
|
r15878 | mergeq = queue(ui, repo.path, newpath) | ||
|
r6960 | ui.warn(_("merging with queue at: %s\n") % mergeq.path) | ||
|
r12281 | ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'), | ||
|
r13033 | mergeq=mergeq, all=opts.get('all'), move=opts.get('move'), | ||
exact=opts.get('exact')) | ||||
|
r1808 | return ret | ||
|
r14298 | @command("^qpop", | ||
[('a', 'all', None, _('pop all patches')), | ||||
('n', 'name', '', | ||||
_('queue name to pop (DEPRECATED)'), _('NAME')), | ||||
('f', 'force', None, _('forget any local changes to patched files'))], | ||||
_('hg qpop [-a] [-f] [PATCH | INDEX]')) | ||||
|
r1808 | def pop(ui, repo, patch=None, **opts): | ||
|
r6611 | """pop the current patch off the stack | ||
|
r6621 | |||
|
r7994 | By default, pops off the top of the patch stack. If given a patch | ||
name, keeps popping off patches until the named patch is at the | ||||
top of the stack. | ||||
|
r12538 | |||
Return 0 on success. | ||||
|
r6611 | """ | ||
|
r1808 | localupdate = True | ||
|
r12281 | if opts.get('name'): | ||
|
r15878 | q = queue(ui, repo.path, repo.join(opts.get('name'))) | ||
|
r6960 | ui.warn(_('using patch queue: %s\n') % q.path) | ||
|
r1808 | localupdate = False | ||
else: | ||||
|
r2724 | q = repo.mq | ||
|
r12281 | ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate, | ||
all=opts.get('all')) | ||||
|
r14580 | q.savedirty() | ||
|
r4099 | return ret | ||
|
r1808 | |||
|
r14298 | @command("qrename|qmv", [], _('hg qrename PATCH1 [PATCH2]')) | ||
|
r2750 | def rename(ui, repo, patch, name=None, **opts): | ||
"""rename a patch | ||||
With one argument, renames the current patch to PATCH1. | ||||
|
r12538 | With two arguments, renames PATCH1 to PATCH2. | ||
Returns 0 on success.""" | ||||
|
r2750 | q = repo.mq | ||
if not name: | ||||
name = patch | ||||
patch = None | ||||
if patch: | ||||
patch = q.lookup(patch) | ||||
else: | ||||
if not q.applied: | ||||
|
r7627 | ui.write(_('no patches applied\n')) | ||
|
r2750 | return | ||
patch = q.lookup('qtip') | ||||
|
r3083 | absdest = q.join(name) | ||
if os.path.isdir(absdest): | ||||
|
r4037 | name = normname(os.path.join(name, os.path.basename(patch))) | ||
|
r3083 | absdest = q.join(name) | ||
|
r14423 | q.checkpatchname(name) | ||
|
r2750 | |||
|
r10510 | ui.note(_('renaming %s to %s\n') % (patch, name)) | ||
|
r14574 | i = q.findseries(patch) | ||
|
r14572 | guards = q.guard_re.findall(q.fullseries[i]) | ||
q.fullseries[i] = name + ''.join([' #' + g for g in guards]) | ||||
|
r14575 | q.parseseries() | ||
|
r15879 | q.seriesdirty = True | ||
|
r2750 | |||
info = q.isapplied(patch) | ||||
if info: | ||||
|
r2818 | q.applied[info[0]] = statusentry(info[1], name) | ||
|
r15879 | q.applieddirty = True | ||
|
r2750 | |||
|
r11513 | destdir = os.path.dirname(absdest) | ||
if not os.path.isdir(destdir): | ||||
os.makedirs(destdir) | ||||
|
r2819 | util.rename(q.join(patch), absdest) | ||
|
r2750 | r = q.qrepo() | ||
|
r12875 | if r and patch in r.dirstate: | ||
|
r11303 | wctx = r[None] | ||
|
r2750 | wlock = r.wlock() | ||
|
r4915 | try: | ||
|
r6648 | if r.dirstate[patch] == 'a': | ||
|
r14434 | r.dirstate.drop(patch) | ||
|
r6648 | r.dirstate.add(name) | ||
else: | ||||
|
r11303 | wctx.copy(patch, name) | ||
|
r14435 | wctx.forget([patch]) | ||
|
r4915 | finally: | ||
|
r8112 | wlock.release() | ||
|
r2750 | |||
|
r14580 | q.savedirty() | ||
|
r2750 | |||
|
r14298 | @command("qrestore", | ||
[('d', 'delete', None, _('delete save entry')), | ||||
('u', 'update', None, _('update queue working directory'))], | ||||
_('hg qrestore [-d] [-u] REV')) | ||||
|
r1808 | def restore(ui, repo, rev, **opts): | ||
|
r10360 | """restore the queue state saved by a revision (DEPRECATED) | ||
|
r12352 | This command is deprecated, use :hg:`rebase` instead.""" | ||
|
r1808 | rev = repo.lookup(rev) | ||
|
r2724 | q = repo.mq | ||
|
r12281 | q.restore(repo, rev, delete=opts.get('delete'), | ||
qupdate=opts.get('update')) | ||||
|
r14580 | q.savedirty() | ||
|
r1808 | return 0 | ||
|
r14298 | @command("qsave", | ||
[('c', 'copy', None, _('copy patch directory')), | ||||
('n', 'name', '', | ||||
_('copy directory name'), _('NAME')), | ||||
('e', 'empty', None, _('clear queue status file')), | ||||
('f', 'force', None, _('force copy'))] + commands.commitopts, | ||||
_('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')) | ||||
|
r1808 | def save(ui, repo, **opts): | ||
|
r10360 | """save current queue state (DEPRECATED) | ||
|
r12352 | This command is deprecated, use :hg:`rebase` instead.""" | ||
|
r2724 | q = repo.mq | ||
|
r14635 | message = cmdutil.logmessage(ui, opts) | ||
|
r2694 | ret = q.save(repo, msg=message) | ||
|
r1808 | if ret: | ||
return ret | ||||
|
r15880 | q.savedirty() # save to .hg/patches before copying | ||
|
r12281 | if opts.get('copy'): | ||
|
r1808 | path = q.path | ||
|
r12281 | if opts.get('name'): | ||
newpath = os.path.join(q.basepath, opts.get('name')) | ||||
|
r1808 | if os.path.exists(newpath): | ||
if not os.path.isdir(newpath): | ||||
|
r2712 | raise util.Abort(_('destination %s exists and is not ' | ||
'a directory') % newpath) | ||||
|
r12281 | if not opts.get('force'): | ||
|
r2712 | raise util.Abort(_('destination %s exists, ' | ||
'use -f to force') % newpath) | ||||
|
r1808 | else: | ||
newpath = savename(path) | ||||
|
r6960 | ui.warn(_("copy %s to %s\n") % (path, newpath)) | ||
|
r1808 | util.copyfiles(path, newpath) | ||
|
r12281 | if opts.get('empty'): | ||
|
r15880 | del q.applied[:] | ||
q.applieddirty = True | ||||
q.savedirty() | ||||
|
r1808 | return 0 | ||
|
r1810 | |||
|
r14298 | @command("strip", | ||
|
r15148 | [ | ||
('r', 'rev', [], _('strip specified revision (optional, ' | ||||
'can specify revisions without this ' | ||||
'option)'), _('REV')), | ||||
('f', 'force', None, _('force removal of changesets, discard ' | ||||
|
r14298 | 'uncommitted changes (no backup)')), | ||
('b', 'backup', None, _('bundle only changesets with local revision' | ||||
' number greater than REV which are not' | ||||
' descendants of REV (DEPRECATED)')), | ||||
('n', 'no-backup', None, _('no backups')), | ||||
('', 'nobackup', None, _('no backups (DEPRECATED)')), | ||||
('k', 'keep', None, _("do not modify working copy during strip"))], | ||||
_('hg strip [-k] [-f] [-n] REV...')) | ||||
|
r11789 | def strip(ui, repo, *revs, **opts): | ||
"""strip changesets and all their descendants from the repository | ||||
The strip command removes the specified changesets and all their | ||||
|
r14502 | descendants. If the working directory has uncommitted changes, the | ||
operation is aborted unless the --force flag is supplied, in which | ||||
case changes will be discarded. | ||||
|
r6635 | |||
|
r11073 | If a parent of the working directory is stripped, then the working | ||
directory will automatically be updated to the most recent | ||||
available ancestor of the stripped parent after the operation | ||||
completes. | ||||
Any stripped changesets are stored in ``.hg/strip-backup`` as a | ||||
|
r11193 | bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can | ||
be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, | ||||
|
r11073 | where BUNDLE is the bundle file created by the strip. Note that | ||
the local revision numbers will in general be different after the | ||||
restore. | ||||
|
r12282 | Use the --no-backup option to discard the backup bundle once the | ||
|
r11073 | operation completes. | ||
|
r12538 | |||
Return 0 on success. | ||||
|
r6635 | """ | ||
|
r1808 | backup = 'all' | ||
|
r12281 | if opts.get('backup'): | ||
|
r1808 | backup = 'strip' | ||
|
r13224 | elif opts.get('no_backup') or opts.get('nobackup'): | ||
|
r1808 | backup = 'none' | ||
|
r6635 | |||
cl = repo.changelog | ||||
|
r15148 | revs = list(revs) + opts.get('rev') | ||
|
r14319 | revs = set(scmutil.revrange(repo, revs)) | ||
|
r12767 | if not revs: | ||
|
r12775 | raise util.Abort(_('empty revision set')) | ||
|
r11789 | |||
descendants = set(cl.descendants(*revs)) | ||||
strippedrevs = revs.union(descendants) | ||||
roots = revs.difference(descendants) | ||||
update = False | ||||
# if one of the wdir parent is stripped we'll need | ||||
# to update away to an earlier revision | ||||
for p in repo.dirstate.parents(): | ||||
if p != nullid and cl.rev(p) in strippedrevs: | ||||
update = True | ||||
break | ||||
rootnodes = set(cl.node(r) for r in roots) | ||||
|
r6635 | |||
|
r11637 | q = repo.mq | ||
if q.applied: | ||||
|
r11789 | # refresh queue state if we're about to strip | ||
# applied patches | ||||
if cl.rev(repo.lookup('qtip')) in strippedrevs: | ||||
|
r14592 | q.applieddirty = True | ||
|
r11637 | start = 0 | ||
end = len(q.applied) | ||||
|
r11789 | for i, statusentry in enumerate(q.applied): | ||
if statusentry.node in rootnodes: | ||||
# if one of the stripped roots is an applied | ||||
# patch, only part of the queue is stripped | ||||
start = i | ||||
break | ||||
|
r11637 | del q.applied[start:end] | ||
|
r14580 | q.savedirty() | ||
|
r11637 | |||
|
r12682 | revs = list(rootnodes) | ||
if update and opts.get('keep'): | ||||
wlock = repo.wlock() | ||||
try: | ||||
urev = repo.mq.qparents(repo, revs[0]) | ||||
repo.dirstate.rebuild(urev, repo[urev].manifest()) | ||||
repo.dirstate.write() | ||||
update = False | ||||
finally: | ||||
wlock.release() | ||||
repo.mq.strip(repo, revs, backup=backup, update=update, | ||||
|
r12281 | force=opts.get('force')) | ||
|
r1808 | return 0 | ||
|
r14298 | @command("qselect", | ||
[('n', 'none', None, _('disable all guards')), | ||||
('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]...')) | ||||
|
r2821 | def select(ui, repo, *args, **opts): | ||
'''set or print guarded patches to push | ||||
|
r11307 | Use the :hg:`qguard` command to set or print guards on patch, then use | ||
|
r7994 | 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 | ||||
|
r9824 | match the current guard. For example:: | ||
|
r2821 | |||
|
r13791 | 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 | ||
|
r7994 | 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). | ||
|
r7994 | 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 | ||
|
r7994 | 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 | |||
|
r7994 | Use -s/--series to print a list of all guards in the series file | ||
|
r12538 | (no other arguments needed). Use -v for more information. | ||
Returns 0 on success.''' | ||||
|
r2821 | |||
q = repo.mq | ||||
guards = q.active() | ||||
|
r12281 | if args or opts.get('none'): | ||
|
r2844 | old_unapplied = q.unapplied(repo) | ||
old_guarded = [i for i in xrange(len(q.applied)) if | ||||
not q.pushable(i)[0]] | ||||
|
r14578 | q.setactive(args) | ||
|
r14580 | q.savedirty() | ||
|
r2821 | if not args: | ||
ui.status(_('guards deactivated\n')) | ||||
|
r12281 | if not opts.get('pop') and not opts.get('reapply'): | ||
|
r2844 | 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))) | ||||
|
r12281 | elif opts.get('series'): | ||
|
r2821 | guards = {} | ||
noguards = 0 | ||||
|
r14573 | for gs in q.seriesguards: | ||
|
r2821 | 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() | ||||
|
r9032 | guards.sort(key=lambda x: x[0][1:]) | ||
|
r2821 | 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')) | ||||
|
r12281 | reapply = opts.get('reapply') and q.applied and q.appliedname(-1) | ||
|
r2844 | popped = False | ||
|
r12281 | if opts.get('pop') or opts.get('reapply'): | ||
|
r2844 | 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: | ||||
|
r15256 | q.pop(repo, str(i - 1)) | ||
|
r2844 | break | ||
if popped: | ||||
try: | ||||
if reapply: | ||||
ui.status(_('reapplying unguarded patches\n')) | ||||
q.push(repo, reapply) | ||||
finally: | ||||
|
r14580 | q.savedirty() | ||
|
r2821 | |||
|
r14298 | @command("qfinish", | ||
[('a', 'applied', None, _('finish all applied changesets'))], | ||||
_('hg qfinish [-a] [REV]...')) | ||||
|
r6645 | def finish(ui, repo, *revrange, **opts): | ||
"""move applied patches into repository history | ||||
|
r7994 | Finishes the specified revisions (corresponding to applied | ||
patches) by moving them out of mq control into regular repository | ||||
history. | ||||
|
r6645 | |||
|
r8076 | Accepts a revision range or the -a/--applied option. If --applied | ||
is specified, all applied mq revisions are removed from mq | ||||
control. Otherwise, the given revisions must be at the base of the | ||||
stack of applied patches. | ||||
|
r6645 | |||
|
r7994 | This can be especially useful if your changes have been applied to | ||
an upstream repository, or if you are about to push your changes | ||||
to upstream. | ||||
|
r12538 | |||
Returns 0 on success. | ||||
|
r6645 | """ | ||
|
r12281 | if not opts.get('applied') and not revrange: | ||
|
r6645 | raise util.Abort(_('no revisions specified')) | ||
|
r12281 | elif opts.get('applied'): | ||
|
r11730 | revrange = ('qbase::qtip',) + revrange | ||
|
r6645 | |||
q = repo.mq | ||||
if not q.applied: | ||||
ui.status(_('no patches applied\n')) | ||||
return 0 | ||||
|
r14319 | revs = scmutil.revrange(repo, revrange) | ||
|
r15476 | if repo['.'].rev() in revs and repo[None].files(): | ||
ui.warn(_('warning: uncommitted changes in the working directory\n')) | ||||
|
r15920 | # queue.finish may changes phases but leave the responsability to lock the | ||
# repo to the caller to avoid deadlock with wlock. This command code is | ||||
# responsability for this locking. | ||||
lock = repo.lock() | ||||
try: | ||||
q.finish(repo, revs) | ||||
q.savedirty() | ||||
finally: | ||||
lock.release() | ||||
|
r6645 | return 0 | ||
|
r14298 | @command("qqueue", | ||
[('l', 'list', False, _('list all available queues')), | ||||
|
r14987 | ('', 'active', False, _('print name of active queue')), | ||
|
r14298 | ('c', 'create', False, _('create new queue')), | ||
('', 'rename', False, _('rename active queue')), | ||||
('', 'delete', False, _('delete reference to queue')), | ||||
('', 'purge', False, _('delete queue, and remove patch dir')), | ||||
], | ||||
_('[OPTION] [QUEUE]')) | ||||
|
r11229 | def qqueue(ui, repo, name=None, **opts): | ||
'''manage multiple patch queues | ||||
Supports switching between different patch queues, as well as creating | ||||
new patch queues and deleting existing ones. | ||||
Omitting a queue name or specifying -l/--list will show you the registered | ||||
queues - by default the "normal" patches queue is registered. The currently | ||||
|
r14987 | active queue will be marked with "(active)". Specifying --active will print | ||
only the name of the active queue. | ||||
|
r11229 | |||
To create a new queue, use -c/--create. The queue is automatically made | ||||
active, except in the case where there are applied patches from the | ||||
currently active queue in the repository. Then the queue will only be | ||||
created and switching will fail. | ||||
To delete an existing queue, use --delete. You cannot delete the currently | ||||
active queue. | ||||
|
r12538 | |||
Returns 0 on success. | ||||
|
r11229 | ''' | ||
q = repo.mq | ||||
_defaultqueue = 'patches' | ||||
|
r11270 | _allqueues = 'patches.queues' | ||
_activequeue = 'patches.queue' | ||||
|
r11229 | |||
def _getcurrent(): | ||||
|
r11270 | cur = os.path.basename(q.path) | ||
if cur.startswith('patches-'): | ||||
cur = cur[8:] | ||||
return cur | ||||
|
r11229 | |||
def _noqueues(): | ||||
try: | ||||
fh = repo.opener(_allqueues, 'r') | ||||
fh.close() | ||||
except IOError: | ||||
return True | ||||
return False | ||||
def _getqueues(): | ||||
current = _getcurrent() | ||||
try: | ||||
fh = repo.opener(_allqueues, 'r') | ||||
queues = [queue.strip() for queue in fh if queue.strip()] | ||||
|
r13400 | fh.close() | ||
|
r11229 | if current not in queues: | ||
queues.append(current) | ||||
except IOError: | ||||
queues = [_defaultqueue] | ||||
return sorted(queues) | ||||
def _setactive(name): | ||||
if q.applied: | ||||
raise util.Abort(_('patches applied - cannot set new queue active')) | ||||
|
r11938 | _setactivenocheck(name) | ||
def _setactivenocheck(name): | ||||
|
r11229 | fh = repo.opener(_activequeue, 'w') | ||
|
r11270 | if name != 'patches': | ||
fh.write(name) | ||||
|
r11229 | fh.close() | ||
def _addqueue(name): | ||||
fh = repo.opener(_allqueues, 'a') | ||||
fh.write('%s\n' % (name,)) | ||||
fh.close() | ||||
|
r11939 | def _queuedir(name): | ||
if name == 'patches': | ||||
return repo.join('patches') | ||||
else: | ||||
return repo.join('patches-' + name) | ||||
|
r11270 | def _validname(name): | ||
for n in name: | ||||
if n in ':\\/.': | ||||
return False | ||||
return True | ||||
|
r11966 | def _delete(name): | ||
if name not in existing: | ||||
raise util.Abort(_('cannot delete queue that does not exist')) | ||||
current = _getcurrent() | ||||
if name == current: | ||||
raise util.Abort(_('cannot delete currently active queue')) | ||||
fh = repo.opener('patches.queues.new', 'w') | ||||
for queue in existing: | ||||
if queue == name: | ||||
continue | ||||
fh.write('%s\n' % (queue,)) | ||||
fh.close() | ||||
util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) | ||||
|
r14987 | if not name or opts.get('list') or opts.get('active'): | ||
|
r11229 | current = _getcurrent() | ||
|
r14987 | if opts.get('active'): | ||
ui.write('%s\n' % (current,)) | ||||
return | ||||
|
r11229 | for queue in _getqueues(): | ||
ui.write('%s' % (queue,)) | ||||
|
r11767 | if queue == current and not ui.quiet: | ||
|
r11229 | ui.write(_(' (active)\n')) | ||
else: | ||||
ui.write('\n') | ||||
return | ||||
|
r11270 | if not _validname(name): | ||
raise util.Abort( | ||||
_('invalid queue name, may not contain the characters ":\\/."')) | ||||
|
r11229 | existing = _getqueues() | ||
if opts.get('create'): | ||||
|
r11271 | if name in existing: | ||
raise util.Abort(_('queue "%s" already exists') % name) | ||||
|
r11229 | if _noqueues(): | ||
_addqueue(_defaultqueue) | ||||
_addqueue(name) | ||||
_setactive(name) | ||||
|
r11939 | elif opts.get('rename'): | ||
|
r11229 | current = _getcurrent() | ||
if name == current: | ||||
|
r11939 | raise util.Abort(_('can\'t rename "%s" to its current name') % name) | ||
if name in existing: | ||||
raise util.Abort(_('queue "%s" already exists') % name) | ||||
olddir = _queuedir(current) | ||||
newdir = _queuedir(name) | ||||
if os.path.exists(newdir): | ||||
raise util.Abort(_('non-queue directory "%s" already exists') % | ||||
newdir) | ||||
|
r11229 | |||
|
r11270 | fh = repo.opener('patches.queues.new', 'w') | ||
|
r11229 | for queue in existing: | ||
|
r11939 | if queue == current: | ||
fh.write('%s\n' % (name,)) | ||||
if os.path.exists(olddir): | ||||
util.rename(olddir, newdir) | ||||
else: | ||||
fh.write('%s\n' % (queue,)) | ||||
|
r11229 | fh.close() | ||
|
r11270 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) | ||
|
r11939 | _setactivenocheck(name) | ||
|
r11229 | elif opts.get('delete'): | ||
|
r11966 | _delete(name) | ||
|
r11967 | elif opts.get('purge'): | ||
if name in existing: | ||||
_delete(name) | ||||
qdir = _queuedir(name) | ||||
if os.path.exists(qdir): | ||||
shutil.rmtree(qdir) | ||||
|
r11229 | else: | ||
|
r11271 | if name not in existing: | ||
raise util.Abort(_('use --create to create a new queue')) | ||||
|
r11229 | _setactive(name) | ||
|
r15928 | def mqphasedefaults(repo, roots): | ||
"""callback used to set mq changeset as secret when no phase data exists""" | ||||
if repo.mq.applied: | ||||
|
r16028 | if repo.ui.configbool('mq', 'secret', False): | ||
mqphase = phases.secret | ||||
else: | ||||
mqphase = phases.draft | ||||
|
r15972 | qbase = repo[repo.mq.applied[0].node] | ||
|
r16028 | roots[mqphase].add(qbase.node()) | ||
|
r15928 | return roots | ||
|
r1808 | def reposetup(ui, repo): | ||
|
r2818 | class mqrepo(repo.__class__): | ||
|
r8524 | @util.propertycache | ||
def mq(self): | ||||
|
r15878 | return queue(self.ui, self.path) | ||
|
r8524 | |||
|
r14596 | def abortifwdirpatched(self, errmsg, force=False): | ||
|
r2848 | if self.mq.applied and not force: | ||
|
r13520 | parents = self.dirstate.parents() | ||
patches = [s.node for s in self.mq.applied] | ||||
if parents[0] in patches or parents[1] in patches: | ||||
|
r2848 | raise util.Abort(errmsg) | ||
|
r3223 | |||
|
r8711 | def commit(self, text="", user=None, date=None, match=None, | ||
force=False, editor=False, extra={}): | ||||
|
r14596 | self.abortifwdirpatched( | ||
|
r2848 | _('cannot commit over an applied mq patch'), | ||
force) | ||||
|
r2845 | |||
|
r8711 | return super(mqrepo, self).commit(text, user, date, match, force, | ||
editor, extra) | ||||
|
r2845 | |||
|
r13327 | def checkpush(self, force, revs): | ||
|
r12378 | if self.mq.applied and not force: | ||
|
r15952 | outapplied = [e.node for e in self.mq.applied] | ||
|
r12378 | if revs: | ||
|
r15952 | # Assume applied patches have no non-patch descendants and | ||
# are not on remote already. Filtering any changeset not | ||||
# pushed. | ||||
heads = set(revs) | ||||
for node in reversed(outapplied): | ||||
if node in heads: | ||||
break | ||||
else: | ||||
outapplied.pop() | ||||
# looking for pushed and shared changeset | ||||
for node in outapplied: | ||||
if repo[node].phase() < phases.secret: | ||||
raise util.Abort(_('source has mq patches applied')) | ||||
# no non-secret patches pushed | ||||
|
r13327 | super(mqrepo, self).checkpush(force, revs) | ||
|
r3223 | |||
|
r9145 | def _findtags(self): | ||
'''augment tags from base class with patch tags''' | ||||
result = super(mqrepo, self)._findtags() | ||||
|
r2682 | |||
|
r2724 | q = self.mq | ||
|
r2723 | if not q.applied: | ||
|
r9145 | return result | ||
|
r2663 | |||
|
r10678 | mqtags = [(patch.node, patch.name) for patch in q.applied] | ||
|
r5979 | |||
|
r13508 | try: | ||
|
r14174 | self.changelog.rev(mqtags[-1][0]) | ||
|
r14600 | except error.LookupError: | ||
|
r6960 | self.ui.warn(_('mq status file refers to unknown node %s\n') | ||
|
r7639 | % short(mqtags[-1][0])) | ||
|
r9145 | return result | ||
|
r5979 | |||
|
r2723 | mqtags.append((mqtags[-1][0], 'qtip')) | ||
mqtags.append((mqtags[0][0], 'qbase')) | ||||
|
r4219 | mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) | ||
|
r9145 | tags = result[0] | ||
|
r2723 | for patch in mqtags: | ||
|
r9145 | if patch[1] in tags: | ||
|
r6960 | self.ui.warn(_('Tag %s overrides mq patch of the same name\n') | ||
% patch[1]) | ||||
|
r2723 | else: | ||
|
r9145 | tags[patch[1]] = patch[0] | ||
|
r2682 | |||
|
r9145 | return result | ||
|
r2664 | |||
|
r6120 | def _branchtags(self, partial, lrev): | ||
|
r3492 | q = self.mq | ||
|
r16101 | cl = self.changelog | ||
qbase = None | ||||
|
r3492 | if not q.applied: | ||
|
r16101 | if getattr(self, '_committingpatch', False): | ||
# Committing a new patch, must be tip | ||||
qbase = len(cl) - 1 | ||||
else: | ||||
qbasenode = q.applied[0].node | ||||
try: | ||||
qbase = cl.rev(qbasenode) | ||||
except error.LookupError: | ||||
self.ui.warn(_('mq status file refers to unknown node %s\n') | ||||
% short(qbasenode)) | ||||
if qbase is None: | ||||
|
r6120 | return super(mqrepo, self)._branchtags(partial, lrev) | ||
|
r3492 | |||
start = lrev + 1 | ||||
if start < qbase: | ||||
# update the cache (excluding the patches) and save it | ||||
|
r10770 | ctxgen = (self[r] for r in xrange(lrev + 1, qbase)) | ||
self._updatebranchcache(partial, ctxgen) | ||||
|
r10282 | self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1) | ||
|
r3492 | 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 | ||||
|
r10770 | ctxgen = (self[r] for r in xrange(start, len(cl))) | ||
self._updatebranchcache(partial, ctxgen) | ||||
|
r3492 | |||
|
r3826 | return partial | ||
|
r3492 | |||
|
r2851 | if repo.local(): | ||
repo.__class__ = mqrepo | ||||
|
r1808 | |||
|
r15928 | repo._phasedefaults.append(mqphasedefaults) | ||
|
r7216 | def mqimport(orig, ui, repo, *args, **kwargs): | ||
|
r14596 | if (hasattr(repo, 'abortifwdirpatched') | ||
|
r10282 | and not kwargs.get('no_commit', False)): | ||
|
r14596 | repo.abortifwdirpatched(_('cannot import over an applied patch'), | ||
|
r7216 | kwargs.get('force')) | ||
return orig(ui, repo, *args, **kwargs) | ||||
|
r10402 | def mqinit(orig, ui, *args, **kwargs): | ||
|
r10558 | mq = kwargs.pop('mq', None) | ||
|
r10402 | |||
if not mq: | ||||
return orig(ui, *args, **kwargs) | ||||
|
r10691 | if args: | ||
repopath = args[0] | ||||
if not hg.islocal(repopath): | ||||
raise util.Abort(_('only a local queue repository ' | ||||
'may be initialized')) | ||||
else: | ||||
repopath = cmdutil.findrepo(os.getcwd()) | ||||
if not repopath: | ||||
|
r12067 | raise util.Abort(_('there is no Mercurial repository here ' | ||
|
r10691 | '(.hg not found)')) | ||
|
r10402 | repo = hg.repository(ui, repopath) | ||
|
r10480 | return qinit(ui, repo, True) | ||
|
r10402 | |||
|
r10359 | def mqcommand(orig, ui, repo, *args, **kwargs): | ||
"""Add --mq option to operate on patch repository instead of main""" | ||||
# some commands do not like getting unknown options | ||||
|
r10558 | mq = kwargs.pop('mq', None) | ||
|
r10359 | |||
if not mq: | ||||
return orig(ui, repo, *args, **kwargs) | ||||
q = repo.mq | ||||
r = q.qrepo() | ||||
if not r: | ||||
|
r11120 | raise util.Abort(_('no queue repository')) | ||
|
r10407 | return orig(r.ui, r, *args, **kwargs) | ||
|
r10359 | |||
|
r11107 | def summary(orig, ui, repo, *args, **kwargs): | ||
r = orig(ui, repo, *args, **kwargs) | ||||
q = repo.mq | ||||
m = [] | ||||
a, u = len(q.applied), len(q.unapplied(repo)) | ||||
if a: | ||||
|
r11121 | m.append(ui.label(_("%d applied"), 'qseries.applied') % a) | ||
|
r11107 | if u: | ||
|
r11121 | m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u) | ||
|
r11107 | if m: | ||
|
r11310 | ui.write("mq: %s\n" % ', '.join(m)) | ||
|
r11107 | else: | ||
|
r11119 | ui.note(_("mq: (empty queue)\n")) | ||
|
r11107 | return r | ||
|
r14210 | def revsetmq(repo, subset, x): | ||
"""``mq()`` | ||||
Changesets managed by MQ. | ||||
""" | ||||
revset.getargs(x, 0, 0, _("mq takes no arguments")) | ||||
applied = set([repo[r.node].rev() for r in repo.mq.applied]) | ||||
return [r for r in subset if r in applied] | ||||
def extsetup(ui): | ||||
revset.symbols['mq'] = revsetmq | ||||
# tell hggettext to extract docstrings from these functions: | ||||
i18nfunctions = [revsetmq] | ||||
|
r7142 | def uisetup(ui): | ||
|
r10591 | mqopt = [('', 'mq', None, _("operate on patch repository"))] | ||
|
r10402 | |||
|
r7216 | extensions.wrapcommand(commands.table, 'import', mqimport) | ||
|
r11107 | extensions.wrapcommand(commands.table, 'summary', summary) | ||
|
r10402 | |||
entry = extensions.wrapcommand(commands.table, 'init', mqinit) | ||||
entry[1].extend(mqopt) | ||||
|
r14448 | nowrap = set(commands.norepo.split(" ")) | ||
|
r12036 | |||
def dotable(cmdtable): | ||||
for cmd in cmdtable.keys(): | ||||
cmd = cmdutil.parsealiases(cmd)[0] | ||||
if cmd in nowrap: | ||||
continue | ||||
entry = extensions.wrapcommand(cmdtable, cmd, mqcommand) | ||||
entry[1].extend(mqopt) | ||||
dotable(commands.table) | ||||
for extname, extmodule in extensions.extensions(): | ||||
if extmodule.__file__ != __file__: | ||||
dotable(getattr(extmodule, 'cmdtable', {})) | ||||
|
r7142 | |||
|
r10826 | |||
colortable = {'qguard.negative': 'red', | ||||
'qguard.positive': 'yellow', | ||||
'qguard.unguarded': 'green', | ||||
'qseries.applied': 'blue bold underline', | ||||
'qseries.guarded': 'black bold', | ||||
'qseries.missing': 'red bold', | ||||
'qseries.unapplied': 'black bold'} | ||||