cmdutil.py
3261 lines
| 118.5 KiB
| text/x-python
|
PythonLexer
/ mercurial / cmdutil.py
Vadim Gelfer
|
r2957 | # cmdutil.py - help for command processing in mercurial | ||
Vadim Gelfer
|
r2874 | # | ||
Thomas Arendsen Hein
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
Vadim Gelfer
|
r2874 | # | ||
Martin Geisler
|
r8225 | # This software may be used and distributed according to the terms of the | ||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
Vadim Gelfer
|
r2874 | |||
Joel Rosdahl
|
r6211 | from node import hex, nullid, nullrev, short | ||
Matt Mackall
|
r3891 | from i18n import _ | ||
Laurent Charignon
|
r24272 | import os, sys, errno, re, tempfile, cStringIO, shutil | ||
Matt Mackall
|
r15214 | import util, scmutil, templater, patch, error, templatekw, revlog, copies | ||
Martin Geisler
|
r12085 | import match as matchmod | ||
Augie Fackler
|
r20392 | import context, repair, graphmod, revset, phases, obsolete, pathutil | ||
Pierre-Yves David
|
r17811 | import changelog | ||
Antonio Zanardo
|
r18538 | import bookmarks | ||
Matt Mackall
|
r22427 | import encoding | ||
Laurent Charignon
|
r24311 | import crecord as crecordmod | ||
Pierre-Yves David
|
r17471 | import lock as lockmod | ||
Vadim Gelfer
|
r2874 | |||
Brendan Cully
|
r10401 | def parsealiases(cmd): | ||
return cmd.lstrip("^").split("|") | ||||
Laurent Charignon
|
r24356 | def setupwrapcolorwrite(ui): | ||
# wrap ui.write so diff output can be labeled/colorized | ||||
def wrapwrite(orig, *args, **kw): | ||||
label = kw.pop('label', '') | ||||
for chunk, l in patch.difflabel(lambda: args): | ||||
orig(chunk, label=label + l) | ||||
oldwrite = ui.write | ||||
def wrap(*args, **kwargs): | ||||
return wrapwrite(oldwrite, *args, **kwargs) | ||||
setattr(ui, 'write', wrap) | ||||
return oldwrite | ||||
Laurent Charignon
|
r24357 | def filterchunks(ui, originalhunks, usecurses, testfile): | ||
Laurent Charignon
|
r24343 | if usecurses: | ||
if testfile: | ||||
recordfn = crecordmod.testdecorator(testfile, | ||||
crecordmod.testchunkselector) | ||||
else: | ||||
recordfn = crecordmod.chunkselector | ||||
return crecordmod.filterpatch(ui, originalhunks, recordfn) | ||||
else: | ||||
return patch.filterpatch(ui, originalhunks) | ||||
Laurent Charignon
|
r24309 | |||
Laurent Charignon
|
r24357 | def recordfilter(ui, originalhunks): | ||
usecurses = ui.configbool('experimental', 'crecord', False) | ||||
testfile = ui.config('experimental', 'crecordtest', None) | ||||
Laurent Charignon
|
r24358 | oldwrite = setupwrapcolorwrite(ui) | ||
try: | ||||
newchunks = filterchunks(ui, originalhunks, usecurses, testfile) | ||||
finally: | ||||
ui.write = oldwrite | ||||
Laurent Charignon
|
r24357 | return newchunks | ||
Laurent Charignon
|
r24309 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, | ||
filterfn, *pats, **opts): | ||||
Laurent Charignon
|
r24272 | import merge as mergemod | ||
Laurent Charignon
|
r24845 | hunkclasses = (crecordmod.uihunk, patch.recordhunk) | ||
ishunk = lambda x: isinstance(x, hunkclasses) | ||||
Laurent Charignon
|
r24345 | |||
Laurent Charignon
|
r24272 | if not ui.interactive(): | ||
raise util.Abort(_('running non-interactively, use %s instead') % | ||||
cmdsuggest) | ||||
# make sure username is set before going interactive | ||||
if not opts.get('user'): | ||||
ui.username() # raise exception, username not provided | ||||
def recordfunc(ui, repo, message, match, opts): | ||||
"""This is generic record driver. | ||||
Its job is to interactively filter local changes, and | ||||
accordingly prepare working directory into a state in which the | ||||
job can be delegated to a non-interactive commit command such as | ||||
'commit' or 'qrefresh'. | ||||
After the actual job is done by non-interactive command, the | ||||
working directory is restored to its original state. | ||||
In the end we'll record interesting changes, and everything else | ||||
will be left in place, so the user can continue working. | ||||
""" | ||||
checkunfinished(repo, commit=True) | ||||
merge = len(repo[None].parents()) > 1 | ||||
if merge: | ||||
raise util.Abort(_('cannot partially commit a merge ' | ||||
'(use "hg commit" instead)')) | ||||
status = repo.status(match=match) | ||||
diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) | ||||
diffopts.nodates = True | ||||
diffopts.git = True | ||||
Laurent Charignon
|
r24341 | originaldiff = patch.diff(repo, changes=status, opts=diffopts) | ||
originalchunks = patch.parsepatch(originaldiff) | ||||
Laurent Charignon
|
r24272 | |||
# 1. filter patch, so we have intending-to apply subset of it | ||||
try: | ||||
Laurent Charignon
|
r24341 | chunks = filterfn(ui, originalchunks) | ||
Laurent Charignon
|
r24272 | except patch.PatchError, err: | ||
raise util.Abort(_('error parsing patch: %s') % err) | ||||
Laurent Charignon
|
r24845 | # We need to keep a backup of files that have been newly added and | ||
# modified during the recording process because there is a previous | ||||
# version without the edit in the workdir | ||||
newlyaddedandmodifiedfiles = set() | ||||
for chunk in chunks: | ||||
if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \ | ||||
originalchunks: | ||||
newlyaddedandmodifiedfiles.add(chunk.header.filename()) | ||||
Laurent Charignon
|
r24272 | contenders = set() | ||
for h in chunks: | ||||
try: | ||||
contenders.update(set(h.files())) | ||||
except AttributeError: | ||||
pass | ||||
changed = status.modified + status.added + status.removed | ||||
newfiles = [f for f in changed if f in contenders] | ||||
if not newfiles: | ||||
ui.status(_('no changes to record\n')) | ||||
return 0 | ||||
modified = set(status.modified) | ||||
# 2. backup changed files, so we can restore them in the end | ||||
if backupall: | ||||
tobackup = changed | ||||
else: | ||||
Laurent Charignon
|
r24845 | tobackup = [f for f in newfiles if f in modified or f in \ | ||
newlyaddedandmodifiedfiles] | ||||
Laurent Charignon
|
r24272 | backups = {} | ||
if tobackup: | ||||
backupdir = repo.join('record-backups') | ||||
try: | ||||
os.mkdir(backupdir) | ||||
except OSError, err: | ||||
if err.errno != errno.EEXIST: | ||||
raise | ||||
try: | ||||
# backup continues | ||||
for f in tobackup: | ||||
fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.', | ||||
dir=backupdir) | ||||
os.close(fd) | ||||
ui.debug('backup %r as %r\n' % (f, tmpname)) | ||||
util.copyfile(repo.wjoin(f), tmpname) | ||||
shutil.copystat(repo.wjoin(f), tmpname) | ||||
backups[f] = tmpname | ||||
fp = cStringIO.StringIO() | ||||
for c in chunks: | ||||
fname = c.filename() | ||||
Laurent Charignon
|
r24837 | if fname in backups: | ||
Laurent Charignon
|
r24272 | c.write(fp) | ||
dopatch = fp.tell() | ||||
fp.seek(0) | ||||
Laurent Charignon
|
r24866 | [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] | ||
Laurent Charignon
|
r24272 | # 3a. apply filtered patch to clean repo (clean) | ||
if backups: | ||||
# Equivalent to hg.revert | ||||
choices = lambda key: key in backups | ||||
mergemod.update(repo, repo.dirstate.p1(), | ||||
False, True, choices) | ||||
# 3b. (apply) | ||||
if dopatch: | ||||
try: | ||||
ui.debug('applying patch\n') | ||||
ui.debug(fp.getvalue()) | ||||
patch.internalpatch(ui, repo, fp, 1, eolmode=None) | ||||
except patch.PatchError, err: | ||||
raise util.Abort(str(err)) | ||||
del fp | ||||
# 4. We prepared working directory according to filtered | ||||
# patch. Now is the time to delegate the job to | ||||
# commit/qrefresh or the like! | ||||
# Make all of the pathnames absolute. | ||||
newfiles = [repo.wjoin(nf) for nf in newfiles] | ||||
Laurent Charignon
|
r24476 | return commitfunc(ui, repo, *newfiles, **opts) | ||
Laurent Charignon
|
r24272 | finally: | ||
# 5. finally restore backed-up files | ||||
try: | ||||
for realname, tmpname in backups.iteritems(): | ||||
ui.debug('restoring %r to %r\n' % (tmpname, realname)) | ||||
util.copyfile(tmpname, repo.wjoin(realname)) | ||||
# Our calls to copystat() here and above are a | ||||
# hack to trick any editors that have f open that | ||||
# we haven't modified them. | ||||
# | ||||
# Also note that this racy as an editor could | ||||
# notice the file's mtime before we've finished | ||||
# writing it. | ||||
shutil.copystat(tmpname, repo.wjoin(realname)) | ||||
os.unlink(tmpname) | ||||
if tobackup: | ||||
os.rmdir(backupdir) | ||||
except OSError: | ||||
pass | ||||
Laurent Charignon
|
r24358 | return commit(ui, repo, recordfunc, pats, opts) | ||
Laurent Charignon
|
r24272 | |||
Matt Mackall
|
r7213 | def findpossible(cmd, table, strict=False): | ||
Matt Mackall
|
r4549 | """ | ||
Return cmd -> (aliases, command table entry) | ||||
for each matching command. | ||||
Return debug commands (or their aliases) only if no normal command matches. | ||||
""" | ||||
choice = {} | ||||
debugchoice = {} | ||||
Matt Mackall
|
r15600 | |||
if cmd in table: | ||||
# short-circuit exact matches, "log" alias beats "^log|history" | ||||
keys = [cmd] | ||||
else: | ||||
keys = table.keys() | ||||
Augie Fackler
|
r24222 | allcmds = [] | ||
Matt Mackall
|
r15600 | for e in keys: | ||
Brendan Cully
|
r10401 | aliases = parsealiases(e) | ||
Augie Fackler
|
r24222 | allcmds.extend(aliases) | ||
Matt Mackall
|
r4549 | found = None | ||
if cmd in aliases: | ||||
found = cmd | ||||
Matt Mackall
|
r7213 | elif not strict: | ||
Matt Mackall
|
r4549 | for a in aliases: | ||
if a.startswith(cmd): | ||||
found = a | ||||
break | ||||
if found is not None: | ||||
if aliases[0].startswith("debug") or found.startswith("debug"): | ||||
Matt Mackall
|
r5178 | debugchoice[found] = (aliases, table[e]) | ||
Matt Mackall
|
r4549 | else: | ||
Matt Mackall
|
r5178 | choice[found] = (aliases, table[e]) | ||
Matt Mackall
|
r4549 | |||
if not choice and debugchoice: | ||||
choice = debugchoice | ||||
Augie Fackler
|
r24222 | return choice, allcmds | ||
Matt Mackall
|
r4549 | |||
Matt Mackall
|
r7213 | def findcmd(cmd, table, strict=True): | ||
Matt Mackall
|
r4549 | """Return (aliases, command table entry) for command string.""" | ||
Augie Fackler
|
r24222 | choice, allcmds = findpossible(cmd, table, strict) | ||
Matt Mackall
|
r4549 | |||
Christian Ebert
|
r5915 | if cmd in choice: | ||
Matt Mackall
|
r4549 | return choice[cmd] | ||
if len(choice) > 1: | ||||
clist = choice.keys() | ||||
clist.sort() | ||||
Matt Mackall
|
r7643 | raise error.AmbiguousCommand(cmd, clist) | ||
Matt Mackall
|
r4549 | |||
if choice: | ||||
return choice.values()[0] | ||||
Augie Fackler
|
r24222 | raise error.UnknownCommand(cmd, allcmds) | ||
Matt Mackall
|
r4549 | |||
Brendan Cully
|
r10402 | def findrepo(p): | ||
while not os.path.isdir(os.path.join(p, ".hg")): | ||||
oldp, p = p, os.path.dirname(p) | ||||
if p == oldp: | ||||
return None | ||||
return p | ||||
FUJIWARA Katsunori
|
r24472 | def bailifchanged(repo, merge=True): | ||
if merge and repo.dirstate.p2() != nullid: | ||||
Matt Mackall
|
r5716 | raise util.Abort(_('outstanding uncommitted merge')) | ||
Matt Mackall
|
r4549 | modified, added, removed, deleted = repo.status()[:4] | ||
if modified or added or removed or deleted: | ||||
Siddharth Agarwal
|
r19804 | raise util.Abort(_('uncommitted changes')) | ||
Eric Roshan Eisner
|
r15231 | ctx = repo[None] | ||
Mads Kiilerich
|
r18364 | for s in sorted(ctx.substate): | ||
FUJIWARA Katsunori
|
r24471 | ctx.sub(s).bailifchanged() | ||
Matt Mackall
|
r4549 | |||
Idan Kamara
|
r14635 | def logmessage(ui, opts): | ||
Matt Mackall
|
r4549 | """ get the log message according to -m and -l option """ | ||
Alexander Solovyov
|
r7667 | message = opts.get('message') | ||
logfile = opts.get('logfile') | ||||
Matt Mackall
|
r4549 | |||
if message and logfile: | ||||
raise util.Abort(_('options --message and --logfile are mutually ' | ||||
'exclusive')) | ||||
if not message and logfile: | ||||
try: | ||||
if logfile == '-': | ||||
Idan Kamara
|
r14635 | message = ui.fin.read() | ||
Matt Mackall
|
r4549 | else: | ||
Patrick Mezard
|
r14249 | message = '\n'.join(util.readfile(logfile).splitlines()) | ||
Matt Mackall
|
r4549 | except IOError, inst: | ||
raise util.Abort(_("can't read commit message '%s': %s") % | ||||
(logfile, inst.strerror)) | ||||
return message | ||||
Mads Kiilerich
|
r24180 | def mergeeditform(ctxorbool, baseformname): | ||
"""return appropriate editform name (referencing a committemplate) | ||||
'ctxorbool' is either a ctx to be committed, or a bool indicating whether | ||||
FUJIWARA Katsunori
|
r22248 | merging is committed. | ||
Mads Kiilerich
|
r24180 | This returns baseformname with '.merge' appended if it is a merge, | ||
otherwise '.normal' is appended. | ||||
FUJIWARA Katsunori
|
r22248 | """ | ||
if isinstance(ctxorbool, bool): | ||||
if ctxorbool: | ||||
Mads Kiilerich
|
r24180 | return baseformname + ".merge" | ||
FUJIWARA Katsunori
|
r22248 | elif 1 < len(ctxorbool.parents()): | ||
Mads Kiilerich
|
r24180 | return baseformname + ".merge" | ||
return baseformname + ".normal" | ||||
FUJIWARA Katsunori
|
r22248 | |||
FUJIWARA Katsunori
|
r21999 | def getcommiteditor(edit=False, finishdesc=None, extramsg=None, | ||
editform='', **opts): | ||||
FUJIWARA Katsunori
|
r21419 | """get appropriate commit message editor according to '--edit' option | ||
'finishdesc' is a function to be called with edited commit message | ||||
(= 'description' of the new changeset) just after editing, but | ||||
before checking empty-ness. It should return actual text to be | ||||
stored into history. This allows to change description before | ||||
storing. | ||||
'extramsg' is a extra message to be shown in the editor instead of | ||||
'Leave message empty to abort commit' line. 'HG: ' prefix and EOL | ||||
is automatically added. | ||||
FUJIWARA Katsunori
|
r21999 | 'editform' is a dot-separated list of names, to distinguish | ||
the purpose of commit text editing. | ||||
FUJIWARA Katsunori
|
r21419 | 'getcommiteditor' returns 'commitforceeditor' regardless of | ||
'edit', if one of 'finishdesc' or 'extramsg' is specified, because | ||||
they are specific for usage in MQ. | ||||
""" | ||||
if edit or finishdesc or extramsg: | ||||
return lambda r, c, s: commitforceeditor(r, c, s, | ||||
finishdesc=finishdesc, | ||||
FUJIWARA Katsunori
|
r21999 | extramsg=extramsg, | ||
editform=editform) | ||||
elif editform: | ||||
return lambda r, c, s: commiteditor(r, c, s, editform=editform) | ||||
FUJIWARA Katsunori
|
r21405 | else: | ||
return commiteditor | ||||
Thomas Arendsen Hein
|
r6190 | def loglimit(opts): | ||
"""get the log limit according to option -l/--limit""" | ||||
limit = opts.get('limit') | ||||
if limit: | ||||
try: | ||||
limit = int(limit) | ||||
except ValueError: | ||||
raise util.Abort(_('limit must be a positive integer')) | ||||
Matt Mackall
|
r10282 | if limit <= 0: | ||
raise util.Abort(_('limit must be positive')) | ||||
Thomas Arendsen Hein
|
r6190 | else: | ||
Nicolas Dumazet
|
r10111 | limit = None | ||
Thomas Arendsen Hein
|
r6190 | return limit | ||
Andrzej Bieniek
|
r14986 | def makefilename(repo, pat, node, desc=None, | ||
Vadim Gelfer
|
r2874 | total=None, seqno=None, revwidth=None, pathname=None): | ||
node_expander = { | ||||
'H': lambda: hex(node), | ||||
'R': lambda: str(repo.changelog.rev(node)), | ||||
'h': lambda: short(node), | ||||
Andrzej Bieniek
|
r14986 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) | ||
Vadim Gelfer
|
r2874 | } | ||
expander = { | ||||
'%': lambda: '%', | ||||
'b': lambda: os.path.basename(repo.root), | ||||
} | ||||
try: | ||||
if node: | ||||
expander.update(node_expander) | ||||
Alexis S. L. Carvalho
|
r4836 | if node: | ||
Vadim Gelfer
|
r2874 | expander['r'] = (lambda: | ||
Alexis S. L. Carvalho
|
r4836 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) | ||
Vadim Gelfer
|
r2874 | if total is not None: | ||
expander['N'] = lambda: str(total) | ||||
if seqno is not None: | ||||
expander['n'] = lambda: str(seqno) | ||||
if total is not None and seqno is not None: | ||||
Thomas Arendsen Hein
|
r3673 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) | ||
Vadim Gelfer
|
r2874 | if pathname is not None: | ||
expander['s'] = lambda: os.path.basename(pathname) | ||||
expander['d'] = lambda: os.path.dirname(pathname) or '.' | ||||
expander['p'] = lambda: pathname | ||||
newname = [] | ||||
patlen = len(pat) | ||||
i = 0 | ||||
while i < patlen: | ||||
c = pat[i] | ||||
if c == '%': | ||||
i += 1 | ||||
c = pat[i] | ||||
c = expander[c]() | ||||
newname.append(c) | ||||
i += 1 | ||||
return ''.join(newname) | ||||
except KeyError, inst: | ||||
timeless
|
r8761 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % | ||
Thomas Arendsen Hein
|
r3072 | inst.args[0]) | ||
Vadim Gelfer
|
r2874 | |||
Andrzej Bieniek
|
r14986 | def makefileobj(repo, pat, node=None, desc=None, total=None, | ||
Yuya Nishihara
|
r19944 | seqno=None, revwidth=None, mode='wb', modemap=None, | ||
Augie Fackler
|
r18613 | pathname=None): | ||
Ronny Pfannschmidt
|
r7319 | |||
Adrian Buehlmann
|
r13769 | writable = mode not in ('r', 'rb') | ||
Ronny Pfannschmidt
|
r7319 | |||
Vadim Gelfer
|
r2874 | if not pat or pat == '-': | ||
Jordi Gutiérrez Hermoso
|
r24306 | if writable: | ||
fp = repo.ui.fout | ||||
else: | ||||
fp = repo.ui.fin | ||||
Augie Fackler
|
r14948 | if util.safehasattr(fp, 'fileno'): | ||
Idan Kamara
|
r14638 | return os.fdopen(os.dup(fp.fileno()), mode) | ||
else: | ||||
# if this fp can't be duped properly, return | ||||
# a dummy object that can be closed | ||||
class wrappedfileobj(object): | ||||
noop = lambda x: None | ||||
def __init__(self, f): | ||||
self.f = f | ||||
def __getattr__(self, attr): | ||||
if attr == 'close': | ||||
return self.noop | ||||
else: | ||||
return getattr(self.f, attr) | ||||
return wrappedfileobj(fp) | ||||
Augie Fackler
|
r14948 | if util.safehasattr(pat, 'write') and writable: | ||
Vadim Gelfer
|
r2874 | return pat | ||
Augie Fackler
|
r14948 | if util.safehasattr(pat, 'read') and 'r' in mode: | ||
Vadim Gelfer
|
r2874 | return pat | ||
Augie Fackler
|
r18613 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) | ||
Yuya Nishihara
|
r19944 | if modemap is not None: | ||
mode = modemap.get(fn, mode) | ||||
if mode == 'wb': | ||||
modemap[fn] = 'ab' | ||||
Augie Fackler
|
r18613 | return open(fn, mode) | ||
Vadim Gelfer
|
r2882 | |||
Sune Foldager
|
r14323 | def openrevlog(repo, cmd, file_, opts): | ||
"""opens the changelog, manifest, a filelog or a given revlog""" | ||||
cl = opts['changelog'] | ||||
mf = opts['manifest'] | ||||
msg = None | ||||
if cl and mf: | ||||
msg = _('cannot specify --changelog and --manifest at the same time') | ||||
elif cl or mf: | ||||
if file_: | ||||
msg = _('cannot specify filename with --changelog or --manifest') | ||||
elif not repo: | ||||
msg = _('cannot specify --changelog or --manifest ' | ||||
'without a repository') | ||||
if msg: | ||||
raise util.Abort(msg) | ||||
r = None | ||||
if repo: | ||||
if cl: | ||||
Matt Mackall
|
r21033 | r = repo.unfiltered().changelog | ||
Sune Foldager
|
r14323 | elif mf: | ||
r = repo.manifest | ||||
elif file_: | ||||
filelog = repo.file(file_) | ||||
if len(filelog): | ||||
r = filelog | ||||
if not r: | ||||
if not file_: | ||||
raise error.CommandError(cmd, _('invalid arguments')) | ||||
if not os.path.isfile(file_): | ||||
raise util.Abort(_("revlog '%s' not found") % file_) | ||||
r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), | ||||
file_[:-2] + ".i") | ||||
return r | ||||
Matt Mackall
|
r5610 | def copy(ui, repo, pats, opts, rename=False): | ||
Matt Mackall
|
r5589 | # called with the repo lock held | ||
# | ||||
# hgsep => pathname that uses "/" to separate directories | ||||
# ossep => pathname that uses os.sep to separate directories | ||||
cwd = repo.getcwd() | ||||
targets = {} | ||||
Matt Mackall
|
r5607 | after = opts.get("after") | ||
dryrun = opts.get("dry_run") | ||||
Dirkjan Ochtman
|
r11303 | wctx = repo[None] | ||
Matt Mackall
|
r5589 | |||
Matt Mackall
|
r5605 | def walkpat(pat): | ||
srcs = [] | ||||
Jordi Gutiérrez Hermoso
|
r24306 | if after: | ||
badstates = '?' | ||||
else: | ||||
badstates = '?r' | ||||
Matt Mackall
|
r14671 | m = scmutil.match(repo[None], [pat], opts, globbed=True) | ||
Matt Mackall
|
r6586 | for abs in repo.walk(m): | ||
Matt Mackall
|
r5605 | state = repo.dirstate[abs] | ||
Matt Mackall
|
r6584 | rel = m.rel(abs) | ||
exact = m.exact(abs) | ||||
Peter Arrenbrecht
|
r11223 | if state in badstates: | ||
Matt Mackall
|
r5605 | if exact and state == '?': | ||
ui.warn(_('%s: not copying - file is not managed\n') % rel) | ||||
if exact and state == 'r': | ||||
ui.warn(_('%s: not copying - file has been marked for' | ||||
' remove\n') % rel) | ||||
continue | ||||
# abs: hgsep | ||||
# rel: ossep | ||||
srcs.append((abs, rel, exact)) | ||||
return srcs | ||||
Matt Mackall
|
r5589 | |||
# abssrc: hgsep | ||||
# relsrc: ossep | ||||
# otarget: ossep | ||||
Matt Mackall
|
r5605 | def copyfile(abssrc, relsrc, otarget, exact): | ||
Augie Fackler
|
r20033 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) | ||
Patrick Mezard
|
r16542 | if '/' in abstarget: | ||
# We cannot normalize abstarget itself, this would prevent | ||||
# case only renames, like a => A. | ||||
abspath, absname = abstarget.rsplit('/', 1) | ||||
abstarget = repo.dirstate.normalize(abspath) + '/' + absname | ||||
Matt Mackall
|
r5589 | reltarget = repo.pathto(abstarget, cwd) | ||
Matt Mackall
|
r5607 | target = repo.wjoin(abstarget) | ||
Matt Mackall
|
r5589 | src = repo.wjoin(abssrc) | ||
Matt Mackall
|
r5608 | state = repo.dirstate[abstarget] | ||
Matt Mackall
|
r5607 | |||
Adrian Buehlmann
|
r13962 | scmutil.checkportable(ui, abstarget) | ||
Adrian Buehlmann
|
r13945 | |||
Matt Mackall
|
r5607 | # check for collisions | ||
prevsrc = targets.get(abstarget) | ||||
Matt Mackall
|
r5589 | if prevsrc is not None: | ||
ui.warn(_('%s: not overwriting - %s collides with %s\n') % | ||||
(reltarget, repo.pathto(abssrc, cwd), | ||||
repo.pathto(prevsrc, cwd))) | ||||
return | ||||
Matt Mackall
|
r5607 | |||
# check for overwrites | ||||
Patrick Mezard
|
r12342 | exists = os.path.lexists(target) | ||
Matt Mackall
|
r16283 | samefile = False | ||
if exists and abssrc != abstarget: | ||||
if (repo.dirstate.normalize(abssrc) == | ||||
repo.dirstate.normalize(abstarget)): | ||||
if not rename: | ||||
ui.warn(_("%s: can't copy - same file\n") % reltarget) | ||||
return | ||||
exists = False | ||||
samefile = True | ||||
Martin Geisler
|
r8117 | if not after and exists or after and state in 'mn': | ||
Matt Mackall
|
r5589 | if not opts['force']: | ||
ui.warn(_('%s: not overwriting - file exists\n') % | ||||
reltarget) | ||||
return | ||||
Matt Mackall
|
r5607 | |||
if after: | ||||
Matt Mackall
|
r5608 | if not exists: | ||
Steve Losh
|
r11152 | if rename: | ||
ui.warn(_('%s: not recording move - %s does not exist\n') % | ||||
(relsrc, reltarget)) | ||||
else: | ||||
ui.warn(_('%s: not recording copy - %s does not exist\n') % | ||||
(relsrc, reltarget)) | ||||
Matt Mackall
|
r5589 | return | ||
Matt Mackall
|
r5608 | elif not dryrun: | ||
Matt Mackall
|
r5589 | try: | ||
Matt Mackall
|
r5608 | if exists: | ||
os.unlink(target) | ||||
targetdir = os.path.dirname(target) or '.' | ||||
if not os.path.isdir(targetdir): | ||||
os.makedirs(targetdir) | ||||
Matt Mackall
|
r16283 | if samefile: | ||
tmp = target + "~hgrename" | ||||
os.rename(src, tmp) | ||||
os.rename(tmp, target) | ||||
else: | ||||
util.copyfile(src, target) | ||||
Adrian Buehlmann
|
r14518 | srcexists = True | ||
Matt Mackall
|
r5589 | except IOError, inst: | ||
if inst.errno == errno.ENOENT: | ||||
Yuya Nishihara
|
r24364 | ui.warn(_('%s: deleted in working directory\n') % relsrc) | ||
Adrian Buehlmann
|
r14518 | srcexists = False | ||
Matt Mackall
|
r5589 | else: | ||
ui.warn(_('%s: cannot copy - %s\n') % | ||||
(relsrc, inst.strerror)) | ||||
Matt Mackall
|
r5606 | return True # report a failure | ||
Matt Mackall
|
r5607 | |||
Matt Mackall
|
r5589 | if ui.verbose or not exact: | ||
Martin Geisler
|
r7894 | if rename: | ||
ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) | ||||
else: | ||||
ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | ||||
Matt Mackall
|
r5608 | |||
Matt Mackall
|
r5589 | targets[abstarget] = abssrc | ||
Matt Mackall
|
r5607 | |||
# fix up dirstate | ||||
Matt Mackall
|
r14321 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, | ||
dryrun=dryrun, cwd=cwd) | ||||
Matt Mackall
|
r5610 | if rename and not dryrun: | ||
Matt Mackall
|
r16283 | if not after and srcexists and not samefile: | ||
Adrian Buehlmann
|
r14518 | util.unlinkpath(repo.wjoin(abssrc)) | ||
wctx.forget([abssrc]) | ||||
Matt Mackall
|
r5589 | |||
# pat: ossep | ||||
# dest ossep | ||||
# srcs: list of (hgsep, hgsep, ossep, bool) | ||||
# return: function that takes hgsep and returns ossep | ||||
def targetpathfn(pat, dest, srcs): | ||||
if os.path.isdir(pat): | ||||
Augie Fackler
|
r20033 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | ||
Matt Mackall
|
r5589 | abspfx = util.localpath(abspfx) | ||
if destdirexists: | ||||
striplen = len(os.path.split(abspfx)[0]) | ||||
else: | ||||
striplen = len(abspfx) | ||||
if striplen: | ||||
striplen += len(os.sep) | ||||
res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) | ||||
elif destdirexists: | ||||
res = lambda p: os.path.join(dest, | ||||
os.path.basename(util.localpath(p))) | ||||
else: | ||||
res = lambda p: dest | ||||
return res | ||||
# pat: ossep | ||||
# dest ossep | ||||
# srcs: list of (hgsep, hgsep, ossep, bool) | ||||
# return: function that takes hgsep and returns ossep | ||||
def targetpathafterfn(pat, dest, srcs): | ||||
Martin Geisler
|
r12085 | if matchmod.patkind(pat): | ||
Matt Mackall
|
r5589 | # a mercurial pattern | ||
res = lambda p: os.path.join(dest, | ||||
os.path.basename(util.localpath(p))) | ||||
else: | ||||
Augie Fackler
|
r20033 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | ||
Matt Mackall
|
r5589 | if len(abspfx) < len(srcs[0][0]): | ||
# A directory. Either the target path contains the last | ||||
# component of the source path or it does not. | ||||
def evalpath(striplen): | ||||
score = 0 | ||||
for s in srcs: | ||||
t = os.path.join(dest, util.localpath(s[0])[striplen:]) | ||||
Patrick Mezard
|
r12357 | if os.path.lexists(t): | ||
Matt Mackall
|
r5589 | score += 1 | ||
return score | ||||
abspfx = util.localpath(abspfx) | ||||
striplen = len(abspfx) | ||||
if striplen: | ||||
striplen += len(os.sep) | ||||
if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): | ||||
score = evalpath(striplen) | ||||
striplen1 = len(os.path.split(abspfx)[0]) | ||||
if striplen1: | ||||
striplen1 += len(os.sep) | ||||
if evalpath(striplen1) > score: | ||||
striplen = striplen1 | ||||
res = lambda p: os.path.join(dest, | ||||
util.localpath(p)[striplen:]) | ||||
else: | ||||
# a file | ||||
if destdirexists: | ||||
res = lambda p: os.path.join(dest, | ||||
os.path.basename(util.localpath(p))) | ||||
else: | ||||
res = lambda p: dest | ||||
return res | ||||
Matt Mackall
|
r14321 | pats = scmutil.expandpats(pats) | ||
Matt Mackall
|
r5589 | if not pats: | ||
raise util.Abort(_('no source or destination specified')) | ||||
if len(pats) == 1: | ||||
raise util.Abort(_('no destination specified')) | ||||
dest = pats.pop() | ||||
Alexis S. L. Carvalho
|
r6258 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) | ||
Matt Mackall
|
r5589 | if not destdirexists: | ||
Martin Geisler
|
r12085 | if len(pats) > 1 or matchmod.patkind(pats[0]): | ||
Matt Mackall
|
r5589 | raise util.Abort(_('with multiple sources, destination must be an ' | ||
'existing directory')) | ||||
Shun-ichi GOTO
|
r5843 | if util.endswithsep(dest): | ||
Matt Mackall
|
r5589 | raise util.Abort(_('destination %s is not a directory') % dest) | ||
Matt Mackall
|
r5607 | |||
tfn = targetpathfn | ||||
if after: | ||||
Matt Mackall
|
r5589 | tfn = targetpathafterfn | ||
copylist = [] | ||||
for pat in pats: | ||||
Matt Mackall
|
r5605 | srcs = walkpat(pat) | ||
Matt Mackall
|
r5589 | if not srcs: | ||
continue | ||||
copylist.append((tfn(pat, dest, srcs), srcs)) | ||||
if not copylist: | ||||
raise util.Abort(_('no files to copy')) | ||||
Matt Mackall
|
r5606 | errors = 0 | ||
Matt Mackall
|
r5589 | for targetpath, srcs in copylist: | ||
Matt Mackall
|
r5605 | for abssrc, relsrc, exact in srcs: | ||
Matt Mackall
|
r5606 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): | ||
errors += 1 | ||||
Matt Mackall
|
r5589 | |||
if errors: | ||||
ui.warn(_('(consider using --after)\n')) | ||||
Matt Mackall
|
r5609 | |||
Matt Mackall
|
r11177 | return errors != 0 | ||
Matt Mackall
|
r5589 | |||
Nicolas Dumazet
|
r9513 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, | ||
Nicolas Dumazet
|
r10012 | runargs=None, appendpid=False): | ||
Bryan O'Sullivan
|
r4380 | '''Run a command as a service.''' | ||
Siddharth Agarwal
|
r19867 | def writepid(pid): | ||
if opts['pid_file']: | ||||
Jordi Gutiérrez Hermoso
|
r24306 | if appendpid: | ||
mode = 'a' | ||||
else: | ||||
mode = 'w' | ||||
Siddharth Agarwal
|
r19867 | fp = open(opts['pid_file'], mode) | ||
fp.write(str(pid) + '\n') | ||||
fp.close() | ||||
Bryan O'Sullivan
|
r4380 | if opts['daemon'] and not opts['daemon_pipefds']: | ||
Patrick Mezard
|
r10238 | # Signal child process startup with file removal | ||
lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') | ||||
Matt Mackall
|
r10282 | os.close(lockfd) | ||
Patrick Mezard
|
r10238 | try: | ||
if not runargs: | ||||
Patrick Mezard
|
r10239 | runargs = util.hgcmd() + sys.argv[1:] | ||
Patrick Mezard
|
r10238 | runargs.append('--daemon-pipefds=%s' % lockpath) | ||
# Don't pass --cwd to the child process, because we've already | ||||
# changed directory. | ||||
Matt Mackall
|
r10282 | for i in xrange(1, len(runargs)): | ||
Patrick Mezard
|
r10238 | if runargs[i].startswith('--cwd='): | ||
del runargs[i] | ||||
break | ||||
elif runargs[i].startswith('--cwd'): | ||||
Matt Mackall
|
r10282 | del runargs[i:i + 2] | ||
Patrick Mezard
|
r10238 | break | ||
Patrick Mezard
|
r10344 | def condfn(): | ||
return not os.path.exists(lockpath) | ||||
pid = util.rundetached(runargs, condfn) | ||||
if pid < 0: | ||||
raise util.Abort(_('child process failed to start')) | ||||
Siddharth Agarwal
|
r19868 | writepid(pid) | ||
Patrick Mezard
|
r10238 | finally: | ||
try: | ||||
os.unlink(lockpath) | ||||
except OSError, e: | ||||
if e.errno != errno.ENOENT: | ||||
raise | ||||
Bryan O'Sullivan
|
r4380 | if parentfn: | ||
return parentfn(pid) | ||||
else: | ||||
Nicolas Dumazet
|
r9896 | return | ||
Bryan O'Sullivan
|
r4380 | |||
if initfn: | ||||
initfn() | ||||
Siddharth Agarwal
|
r19868 | if not opts['daemon']: | ||
writepid(os.getpid()) | ||||
Bryan O'Sullivan
|
r4380 | |||
if opts['daemon_pipefds']: | ||||
Patrick Mezard
|
r10238 | lockpath = opts['daemon_pipefds'] | ||
Bryan O'Sullivan
|
r4380 | try: | ||
os.setsid() | ||||
except AttributeError: | ||||
pass | ||||
Patrick Mezard
|
r10238 | os.unlink(lockpath) | ||
Patrick Mezard
|
r10240 | util.hidewindow() | ||
Bryan O'Sullivan
|
r4380 | sys.stdout.flush() | ||
sys.stderr.flush() | ||||
Nicolas Dumazet
|
r8789 | |||
Ross Lagerwall
|
r17391 | nullfd = os.open(os.devnull, os.O_RDWR) | ||
Nicolas Dumazet
|
r8789 | logfilefd = nullfd | ||
if logfile: | ||||
logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) | ||||
os.dup2(nullfd, 0) | ||||
os.dup2(logfilefd, 1) | ||||
os.dup2(logfilefd, 2) | ||||
if nullfd not in (0, 1, 2): | ||||
os.close(nullfd) | ||||
if logfile and logfilefd not in (0, 1, 2): | ||||
os.close(logfilefd) | ||||
Bryan O'Sullivan
|
r4380 | |||
if runfn: | ||||
return runfn() | ||||
Pierre-Yves David
|
r20500 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): | ||
"""Utility function used by commands.import to import a single patch | ||||
This function is explicitly defined here to help the evolve extension to | ||||
wrap this part of the import logic. | ||||
The API is currently a bit ugly because it a simple code translation from | ||||
the import command. Feel free to make it better. | ||||
:hunk: a patch (as a binary string) | ||||
:parents: nodes that will be parent of the created commit | ||||
:opts: the full dict of option passed to the import command | ||||
:msgs: list to save commit message to. | ||||
(used in case we need to save it when failing) | ||||
:updatefunc: a function that update a repo to a given node | ||||
updatefunc(<repo>, <node>) | ||||
""" | ||||
tmpname, message, user, date, branch, nodeid, p1, p2 = \ | ||||
patch.extract(ui, hunk) | ||||
update = not opts.get('bypass') | ||||
strip = opts["strip"] | ||||
Siddharth Agarwal
|
r24259 | prefix = opts["prefix"] | ||
Pierre-Yves David
|
r20500 | sim = float(opts.get('similarity') or 0) | ||
if not tmpname: | ||||
Pierre-Yves David
|
r21553 | return (None, None, False) | ||
Pierre-Yves David
|
r20500 | msg = _('applied to working directory') | ||
Pierre-Yves David
|
r21553 | rejects = False | ||
Pierre-Yves David
|
r20500 | try: | ||
cmdline_message = logmessage(ui, opts) | ||||
if cmdline_message: | ||||
# pickup the cmdline msg | ||||
message = cmdline_message | ||||
elif message: | ||||
# pickup the patch msg | ||||
message = message.strip() | ||||
else: | ||||
# launch the editor | ||||
message = None | ||||
ui.debug('message:\n%s\n' % message) | ||||
if len(parents) == 1: | ||||
parents.append(repo[nullid]) | ||||
if opts.get('exact'): | ||||
if not nodeid or not p1: | ||||
raise util.Abort(_('not a Mercurial patch')) | ||||
p1 = repo[p1] | ||||
p2 = repo[p2 or nullid] | ||||
elif p2: | ||||
try: | ||||
p1 = repo[p1] | ||||
p2 = repo[p2] | ||||
# Without any options, consider p2 only if the | ||||
# patch is being applied on top of the recorded | ||||
# first parent. | ||||
if p1 != parents[0]: | ||||
p1 = parents[0] | ||||
p2 = repo[nullid] | ||||
except error.RepoError: | ||||
p1, p2 = parents | ||||
FUJIWARA Katsunori
|
r22303 | if p2.node() == nullid: | ||
ui.warn(_("warning: import the patch as a normal revision\n" | ||||
"(use --exact to import the patch as a merge)\n")) | ||||
Pierre-Yves David
|
r20500 | else: | ||
p1, p2 = parents | ||||
n = None | ||||
if update: | ||||
Durham Goode
|
r22405 | repo.dirstate.beginparentchange() | ||
Pierre-Yves David
|
r20500 | if p1 != parents[0]: | ||
updatefunc(repo, p1.node()) | ||||
if p2 != parents[1]: | ||||
repo.setparents(p1.node(), p2.node()) | ||||
if opts.get('exact') or opts.get('import_branch'): | ||||
repo.dirstate.setbranch(branch or 'default') | ||||
Pierre-Yves David
|
r21553 | partial = opts.get('partial', False) | ||
Pierre-Yves David
|
r20500 | files = set() | ||
Pierre-Yves David
|
r21553 | try: | ||
Siddharth Agarwal
|
r24259 | patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix, | ||
files=files, eolmode=None, similarity=sim / 100.0) | ||||
Pierre-Yves David
|
r21553 | except patch.PatchError, e: | ||
if not partial: | ||||
raise util.Abort(str(e)) | ||||
if partial: | ||||
rejects = True | ||||
Pierre-Yves David
|
r20500 | files = list(files) | ||
if opts.get('no_commit'): | ||||
if message: | ||||
msgs.append(message) | ||||
else: | ||||
if opts.get('exact') or p2: | ||||
# If you got here, you either use --force and know what | ||||
# you are doing or used --exact or a merge patch while | ||||
# being updated to its first parent. | ||||
m = None | ||||
else: | ||||
m = scmutil.matchfiles(repo, files or []) | ||||
FUJIWARA Katsunori
|
r22250 | editform = mergeeditform(repo[None], 'import.normal') | ||
FUJIWARA Katsunori
|
r22278 | if opts.get('exact'): | ||
editor = None | ||||
else: | ||||
editor = getcommiteditor(editform=editform, **opts) | ||||
Pierre-Yves David
|
r20500 | n = repo.commit(message, opts.get('user') or user, | ||
opts.get('date') or date, match=m, | ||||
Pierre-Yves David
|
r21553 | editor=editor, force=partial) | ||
Durham Goode
|
r22405 | repo.dirstate.endparentchange() | ||
Pierre-Yves David
|
r20500 | else: | ||
if opts.get('exact') or opts.get('import_branch'): | ||||
branch = branch or 'default' | ||||
else: | ||||
branch = p1.branch() | ||||
store = patch.filestore() | ||||
try: | ||||
files = set() | ||||
try: | ||||
Siddharth Agarwal
|
r24260 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix, | ||
Pierre-Yves David
|
r20500 | files, eolmode=None) | ||
except patch.PatchError, e: | ||||
raise util.Abort(str(e)) | ||||
FUJIWARA Katsunori
|
r22278 | if opts.get('exact'): | ||
editor = None | ||||
else: | ||||
editor = getcommiteditor(editform='import.bypass') | ||||
Pierre-Yves David
|
r20500 | memctx = context.makememctx(repo, (p1.node(), p2.node()), | ||
message, | ||||
opts.get('user') or user, | ||||
opts.get('date') or date, | ||||
branch, files, store, | ||||
FUJIWARA Katsunori
|
r22011 | editor=editor) | ||
Pierre-Yves David
|
r20500 | n = memctx.commit() | ||
finally: | ||||
store.close() | ||||
Matt Mackall
|
r22485 | if opts.get('exact') and opts.get('no_commit'): | ||
# --exact with --no-commit is still useful in that it does merge | ||||
# and branch bits | ||||
ui.warn(_("warning: can't check exact import with --no-commit\n")) | ||||
elif opts.get('exact') and hex(n) != nodeid: | ||||
Pierre-Yves David
|
r20500 | raise util.Abort(_('patch is damaged or loses information')) | ||
if n: | ||||
# i18n: refers to a short changeset id | ||||
msg = _('created %s') % short(n) | ||||
Pierre-Yves David
|
r21553 | return (msg, n, rejects) | ||
Pierre-Yves David
|
r20500 | finally: | ||
os.unlink(tmpname) | ||||
Benoit Boissinot
|
r10611 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, | ||
opts=None): | ||||
'''export changesets as hg patches.''' | ||||
total = len(revs) | ||||
revwidth = max([len(str(rev)) for rev in revs]) | ||||
Augie Fackler
|
r18613 | filemode = {} | ||
Benoit Boissinot
|
r10611 | |||
def single(rev, seqno, fp): | ||||
ctx = repo[rev] | ||||
node = ctx.node() | ||||
parents = [p.node() for p in ctx.parents() if p] | ||||
branch = ctx.branch() | ||||
if switch_parent: | ||||
parents.reverse() | ||||
Jordi Gutiérrez Hermoso
|
r24306 | |||
if parents: | ||||
prev = parents[0] | ||||
else: | ||||
prev = nullid | ||||
Benoit Boissinot
|
r10611 | |||
Dan Villiom Podlaski Christiansen
|
r13400 | shouldclose = False | ||
Ankur Dahiya
|
r17460 | if not fp and len(template) > 0: | ||
Andrzej Bieniek
|
r14986 | desc_lines = ctx.description().rstrip().split('\n') | ||
desc = desc_lines[0] #Commit always has a first line. | ||||
fp = makefileobj(repo, template, node, desc=desc, total=total, | ||||
Augie Fackler
|
r18613 | seqno=seqno, revwidth=revwidth, mode='wb', | ||
modemap=filemode) | ||||
Waqas Hussain
|
r13467 | if fp != template: | ||
shouldclose = True | ||||
Ankur Dahiya
|
r17460 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): | ||
Benoit Boissinot
|
r10611 | repo.ui.note("%s\n" % fp.name) | ||
Ankur Dahiya
|
r17460 | if not fp: | ||
write = repo.ui.write | ||||
else: | ||||
def write(s, **kw): | ||||
fp.write(s) | ||||
write("# HG changeset patch\n") | ||||
write("# User %s\n" % ctx.user()) | ||||
write("# Date %d %d\n" % ctx.date()) | ||||
Mads Kiilerich
|
r18648 | write("# %s\n" % util.datestr(ctx.date())) | ||
Martin Geisler
|
r11821 | if branch and branch != 'default': | ||
Ankur Dahiya
|
r17460 | write("# Branch %s\n" % branch) | ||
write("# Node ID %s\n" % hex(node)) | ||||
write("# Parent %s\n" % hex(prev)) | ||||
Benoit Boissinot
|
r10611 | if len(parents) > 1: | ||
Ankur Dahiya
|
r17460 | write("# Parent %s\n" % hex(parents[1])) | ||
write(ctx.description().rstrip()) | ||||
write("\n\n") | ||||
Benoit Boissinot
|
r10611 | |||
Ankur Dahiya
|
r17460 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): | ||
write(chunk, label=label) | ||||
Benoit Boissinot
|
r10611 | |||
Dan Villiom Podlaski Christiansen
|
r13400 | if shouldclose: | ||
fp.close() | ||||
Dan Villiom Podlaski Christiansen
|
r13081 | |||
Benoit Boissinot
|
r10611 | for seqno, rev in enumerate(revs): | ||
single(rev, seqno + 1, fp) | ||||
Yuya Nishihara
|
r11050 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, | ||
Martin Geisler
|
r12167 | changes=None, stat=False, fp=None, prefix='', | ||
Sean Farley
|
r24455 | root='', listsubrepos=False): | ||
Yuya Nishihara
|
r11050 | '''show diff or diffstat.''' | ||
if fp is None: | ||||
write = ui.write | ||||
else: | ||||
def write(s, **kw): | ||||
fp.write(s) | ||||
Sean Farley
|
r24455 | if root: | ||
relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) | ||||
Siddharth Agarwal
|
r24431 | else: | ||
relroot = '' | ||||
if relroot != '': | ||||
# XXX relative roots currently don't work if the root is within a | ||||
# subrepo | ||||
uirelroot = match.uipath(relroot) | ||||
relroot += '/' | ||||
for matchroot in match.files(): | ||||
if not matchroot.startswith(relroot): | ||||
ui.warn(_('warning: %s not inside relative root %s\n') % ( | ||||
match.uipath(matchroot), uirelroot)) | ||||
Yuya Nishihara
|
r11050 | if stat: | ||
Alecs King
|
r11950 | diffopts = diffopts.copy(context=0) | ||
Yuya Nishihara
|
r11050 | width = 80 | ||
if not ui.plain(): | ||||
Augie Fackler
|
r12689 | width = ui.termwidth() | ||
Martin Geisler
|
r12167 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, | ||
Siddharth Agarwal
|
r24431 | prefix=prefix, relroot=relroot) | ||
Yuya Nishihara
|
r11050 | for chunk, label in patch.diffstatui(util.iterlines(chunks), | ||
width=width, | ||||
git=diffopts.git): | ||||
write(chunk, label=label) | ||||
else: | ||||
for chunk, label in patch.diffui(repo, node1, node2, match, | ||||
Siddharth Agarwal
|
r24431 | changes, diffopts, prefix=prefix, | ||
relroot=relroot): | ||||
Yuya Nishihara
|
r11050 | write(chunk, label=label) | ||
Martin Geisler
|
r12167 | if listsubrepos: | ||
ctx1 = repo[node1] | ||||
Martin Geisler
|
r12175 | ctx2 = repo[node2] | ||
Augie Fackler
|
r20392 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | ||
Alistair Bell
|
r15698 | tempnode2 = node2 | ||
Renato Cunha
|
r15634 | try: | ||
if node2 is not None: | ||||
Alistair Bell
|
r15698 | tempnode2 = ctx2.substate[subpath][1] | ||
Renato Cunha
|
r15634 | except KeyError: | ||
# A subrepo that existed in node1 was deleted between node1 and | ||||
# node2 (inclusive). Thus, ctx2's substate won't contain that | ||||
# subpath. The best we can do is to ignore it. | ||||
Alistair Bell
|
r15698 | tempnode2 = None | ||
Martin Geisler
|
r12167 | submatch = matchmod.narrowmatcher(subpath, match) | ||
FUJIWARA Katsunori
|
r18006 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, | ||
Martin Geisler
|
r12167 | stat=stat, fp=fp, prefix=prefix) | ||
Matt Mackall
|
r3643 | class changeset_printer(object): | ||
'''show changeset information when templating not requested.''' | ||||
Martin von Zweigbergk
|
r22386 | def __init__(self, ui, repo, matchfn, diffopts, buffered): | ||
Matt Mackall
|
r3643 | self.ui = ui | ||
self.repo = repo | ||||
Matt Mackall
|
r3645 | self.buffered = buffered | ||
Martin von Zweigbergk
|
r22386 | self.matchfn = matchfn | ||
Jim Correia
|
r7762 | self.diffopts = diffopts | ||
Matt Mackall
|
r3738 | self.header = {} | ||
self.hunk = {} | ||||
self.lastheader = None | ||||
Robert Bachmann
|
r10152 | self.footer = None | ||
Matt Mackall
|
r3645 | |||
def flush(self, rev): | ||||
Matt Mackall
|
r3738 | if rev in self.header: | ||
h = self.header[rev] | ||||
if h != self.lastheader: | ||||
self.lastheader = h | ||||
self.ui.write(h) | ||||
del self.header[rev] | ||||
if rev in self.hunk: | ||||
self.ui.write(self.hunk[rev]) | ||||
del self.hunk[rev] | ||||
return 1 | ||||
return 0 | ||||
Matt Mackall
|
r3643 | |||
Robert Bachmann
|
r10152 | def close(self): | ||
if self.footer: | ||||
self.ui.write(self.footer) | ||||
Mads Kiilerich
|
r11488 | def show(self, ctx, copies=None, matchfn=None, **props): | ||
Matt Mackall
|
r3738 | if self.buffered: | ||
self.ui.pushbuffer() | ||||
Mads Kiilerich
|
r11488 | self._show(ctx, copies, matchfn, props) | ||
Brodie Rao
|
r10819 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) | ||
Matt Mackall
|
r3738 | else: | ||
Mads Kiilerich
|
r11488 | self._show(ctx, copies, matchfn, props) | ||
Matt Mackall
|
r3738 | |||
Mads Kiilerich
|
r11488 | def _show(self, ctx, copies, matchfn, props): | ||
Matt Mackall
|
r3643 | '''show a single changeset or file revision''' | ||
Dirkjan Ochtman
|
r7369 | changenode = ctx.node() | ||
rev = ctx.rev() | ||||
Jordi Gutiérrez Hermoso
|
r24306 | if self.ui.debugflag: | ||
hexfunc = hex | ||||
else: | ||||
hexfunc = short | ||||
Yuya Nishihara
|
r24584 | if rev is None: | ||
pctx = ctx.p1() | ||||
revnode = (pctx.rev(), hexfunc(pctx.node()) + '+') | ||||
else: | ||||
revnode = (rev, hexfunc(changenode)) | ||||
if self.ui.quiet: | ||||
self.ui.write("%d:%s\n" % revnode, label='log.node') | ||||
return | ||||
date = util.datestr(ctx.date()) | ||||
Matt Mackall
|
r3643 | |||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Yuya Nishihara
|
r24584 | self.ui.write(_("changeset: %d:%s\n") % revnode, | ||
Sean Farley
|
r17788 | label='log.changeset changeset.%s' % ctx.phasestr()) | ||
Matt Mackall
|
r3643 | |||
Sean Farley
|
r23772 | # branches are shown first before any other names due to backwards | ||
# compatibility | ||||
Adrian Buehlmann
|
r9637 | branch = ctx.branch() | ||
Alexis S. L. Carvalho
|
r4176 | # don't show the default branch name | ||
if branch != 'default': | ||||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Brodie Rao
|
r10819 | self.ui.write(_("branch: %s\n") % branch, | ||
label='log.branch') | ||||
Sean Farley
|
r23772 | |||
for name, ns in self.repo.names.iteritems(): | ||||
# branches has special logic already handled above, so here we just | ||||
# skip it | ||||
if name == 'branches': | ||||
continue | ||||
# we will use the templatename as the color name since those two | ||||
# should be the same | ||||
for name in ns.names(self.repo, changenode): | ||||
FUJIWARA Katsunori
|
r23967 | self.ui.write(ns.logfmt % name, | ||
label='log.%s' % ns.colorname) | ||||
Jordi Gutiérrez Hermoso
|
r22765 | if self.ui.debugflag: | ||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
FUJIWARA Katsunori
|
r24864 | self.ui.write(_("phase: %s\n") % ctx.phasestr(), | ||
Pierre-Yves David
|
r15907 | label='log.phase') | ||
Yuya Nishihara
|
r24484 | for pctx in self._meaningful_parentrevs(ctx): | ||
Yuya Nishihara
|
r24483 | label = 'log.parent changeset.%s' % pctx.phasestr() | ||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Yuya Nishihara
|
r24483 | self.ui.write(_("parent: %d:%s\n") | ||
% (pctx.rev(), hexfunc(pctx.node())), | ||||
Sean Farley
|
r22301 | label=label) | ||
Matt Mackall
|
r3643 | |||
Yuya Nishihara
|
r24585 | if self.ui.debugflag and rev is not None: | ||
Greg Ward
|
r9547 | mnode = ctx.manifestnode() | ||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Matt Mackall
|
r3643 | self.ui.write(_("manifest: %d:%s\n") % | ||
Brodie Rao
|
r10819 | (self.repo.manifest.rev(mnode), hex(mnode)), | ||
label='ui.debug log.manifest') | ||||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Brodie Rao
|
r10819 | self.ui.write(_("user: %s\n") % ctx.user(), | ||
label='log.user') | ||||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Brodie Rao
|
r10819 | self.ui.write(_("date: %s\n") % date, | ||
label='log.date') | ||||
Matt Mackall
|
r3643 | |||
if self.ui.debugflag: | ||||
Yuya Nishihara
|
r24485 | files = ctx.p1().status(ctx)[:3] | ||
FUJIWARA Katsunori
|
r17891 | for key, value in zip([# i18n: column positioning for "hg log" | ||
_("files:"), | ||||
# i18n: column positioning for "hg log" | ||||
_("files+:"), | ||||
# i18n: column positioning for "hg log" | ||||
_("files-:")], files): | ||||
Matt Mackall
|
r3643 | if value: | ||
Brodie Rao
|
r10819 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), | ||
label='ui.debug log.files') | ||||
Greg Ward
|
r9547 | elif ctx.files() and self.ui.verbose: | ||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Brodie Rao
|
r10819 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), | ||
label='ui.note log.files') | ||||
Matt Mackall
|
r3643 | if copies and self.ui.verbose: | ||
copies = ['%s (%s)' % c for c in copies] | ||||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Brodie Rao
|
r10819 | self.ui.write(_("copies: %s\n") % ' '.join(copies), | ||
label='ui.note log.copies') | ||||
Matt Mackall
|
r3643 | |||
Adrian Buehlmann
|
r9637 | extra = ctx.extra() | ||
Matt Mackall
|
r3643 | if extra and self.ui.debugflag: | ||
Matt Mackall
|
r8209 | for key, value in sorted(extra.items()): | ||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Matt Mackall
|
r3643 | self.ui.write(_("extra: %s=%s\n") | ||
Brodie Rao
|
r10819 | % (key, value.encode('string_escape')), | ||
label='ui.debug log.extra') | ||||
Matt Mackall
|
r3643 | |||
Greg Ward
|
r9547 | description = ctx.description().strip() | ||
Matt Mackall
|
r3643 | if description: | ||
if self.ui.verbose: | ||||
Brodie Rao
|
r10819 | self.ui.write(_("description:\n"), | ||
label='ui.note log.description') | ||||
self.ui.write(description, | ||||
label='ui.note log.description') | ||||
Matt Mackall
|
r3643 | self.ui.write("\n\n") | ||
else: | ||||
FUJIWARA Katsunori
|
r17891 | # i18n: column positioning for "hg log" | ||
Matt Mackall
|
r3643 | self.ui.write(_("summary: %s\n") % | ||
Brodie Rao
|
r10819 | description.splitlines()[0], | ||
label='log.summary') | ||||
Matt Mackall
|
r3643 | self.ui.write("\n") | ||
Mads Kiilerich
|
r11488 | self.showpatch(changenode, matchfn) | ||
Matt Mackall
|
r3645 | |||
Mads Kiilerich
|
r11488 | def showpatch(self, node, matchfn): | ||
if not matchfn: | ||||
Martin von Zweigbergk
|
r22386 | matchfn = self.matchfn | ||
Mads Kiilerich
|
r11488 | if matchfn: | ||
Yuya Nishihara
|
r11061 | stat = self.diffopts.get('stat') | ||
Alecs King
|
r11950 | diff = self.diffopts.get('patch') | ||
Siddharth Agarwal
|
r23691 | diffopts = patch.diffallopts(self.ui, self.diffopts) | ||
Matt Mackall
|
r3645 | prev = self.repo.changelog.parents(node)[0] | ||
Alecs King
|
r11950 | if stat: | ||
diffordiffstat(self.ui, self.repo, diffopts, prev, node, | ||||
match=matchfn, stat=True) | ||||
if diff: | ||||
if stat: | ||||
self.ui.write("\n") | ||||
diffordiffstat(self.ui, self.repo, diffopts, prev, node, | ||||
match=matchfn, stat=False) | ||||
Matt Mackall
|
r3645 | self.ui.write("\n") | ||
Yuya Nishihara
|
r24484 | def _meaningful_parentrevs(self, ctx): | ||
Thomas Arendsen Hein
|
r4825 | """Return list of meaningful (or all if debug) parentrevs for rev. | ||
For merges (two non-nullrev revisions) both parents are meaningful. | ||||
Otherwise the first parent revision is considered meaningful if it | ||||
is not the preceding revision. | ||||
""" | ||||
Yuya Nishihara
|
r24484 | parents = ctx.parents() | ||
if len(parents) > 1: | ||||
return parents | ||||
if self.ui.debugflag: | ||||
return [parents[0], self.repo['null']] | ||||
Yuya Nishihara
|
r24583 | if parents[0].rev() >= scmutil.intrev(self.repo, ctx.rev()) - 1: | ||
Yuya Nishihara
|
r24484 | return [] | ||
Thomas Arendsen Hein
|
r4825 | return parents | ||
Matt Mackall
|
r22427 | class jsonchangeset(changeset_printer): | ||
'''format changeset information.''' | ||||
def __init__(self, ui, repo, matchfn, diffopts, buffered): | ||||
changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered) | ||||
self.cache = {} | ||||
self._first = True | ||||
def close(self): | ||||
if not self._first: | ||||
self.ui.write("\n]\n") | ||||
else: | ||||
self.ui.write("[]\n") | ||||
def _show(self, ctx, copies, matchfn, props): | ||||
'''show a single changeset or file revision''' | ||||
rev = ctx.rev() | ||||
Yuya Nishihara
|
r24602 | if rev is None: | ||
jrev = jnode = 'null' | ||||
else: | ||||
jrev = str(rev) | ||||
jnode = '"%s"' % hex(ctx.node()) | ||||
Matt Mackall
|
r22427 | j = encoding.jsonescape | ||
if self._first: | ||||
self.ui.write("[\n {") | ||||
self._first = False | ||||
else: | ||||
self.ui.write(",\n {") | ||||
if self.ui.quiet: | ||||
Yuya Nishihara
|
r24602 | self.ui.write('\n "rev": %s' % jrev) | ||
self.ui.write(',\n "node": %s' % jnode) | ||||
Matt Mackall
|
r22427 | self.ui.write('\n }') | ||
return | ||||
Yuya Nishihara
|
r24602 | self.ui.write('\n "rev": %s' % jrev) | ||
self.ui.write(',\n "node": %s' % jnode) | ||||
Matt Mackall
|
r22427 | self.ui.write(',\n "branch": "%s"' % j(ctx.branch())) | ||
self.ui.write(',\n "phase": "%s"' % ctx.phasestr()) | ||||
self.ui.write(',\n "user": "%s"' % j(ctx.user())) | ||||
self.ui.write(',\n "date": [%d, %d]' % ctx.date()) | ||||
self.ui.write(',\n "desc": "%s"' % j(ctx.description())) | ||||
self.ui.write(',\n "bookmarks": [%s]' % | ||||
", ".join('"%s"' % j(b) for b in ctx.bookmarks())) | ||||
self.ui.write(',\n "tags": [%s]' % | ||||
", ".join('"%s"' % j(t) for t in ctx.tags())) | ||||
self.ui.write(',\n "parents": [%s]' % | ||||
", ".join('"%s"' % c.hex() for c in ctx.parents())) | ||||
if self.ui.debugflag: | ||||
Yuya Nishihara
|
r24603 | if rev is None: | ||
jmanifestnode = 'null' | ||||
else: | ||||
jmanifestnode = '"%s"' % hex(ctx.manifestnode()) | ||||
self.ui.write(',\n "manifest": %s' % jmanifestnode) | ||||
Matt Mackall
|
r22427 | |||
self.ui.write(',\n "extra": {%s}' % | ||||
", ".join('"%s": "%s"' % (j(k), j(v)) | ||||
for k, v in ctx.extra().items())) | ||||
Gregory Szorc
|
r23734 | files = ctx.p1().status(ctx) | ||
Matt Mackall
|
r22427 | self.ui.write(',\n "modified": [%s]' % | ||
", ".join('"%s"' % j(f) for f in files[0])) | ||||
self.ui.write(',\n "added": [%s]' % | ||||
", ".join('"%s"' % j(f) for f in files[1])) | ||||
self.ui.write(',\n "removed": [%s]' % | ||||
", ".join('"%s"' % j(f) for f in files[2])) | ||||
elif self.ui.verbose: | ||||
self.ui.write(',\n "files": [%s]' % | ||||
", ".join('"%s"' % j(f) for f in ctx.files())) | ||||
if copies: | ||||
self.ui.write(',\n "copies": {%s}' % | ||||
Augie Fackler
|
r24013 | ", ".join('"%s": "%s"' % (j(k), j(v)) | ||
for k, v in copies)) | ||||
Matt Mackall
|
r22427 | |||
matchfn = self.matchfn | ||||
if matchfn: | ||||
stat = self.diffopts.get('stat') | ||||
diff = self.diffopts.get('patch') | ||||
Siddharth Agarwal
|
r23453 | diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True) | ||
Matt Mackall
|
r22427 | node, prev = ctx.node(), ctx.p1().node() | ||
if stat: | ||||
self.ui.pushbuffer() | ||||
diffordiffstat(self.ui, self.repo, diffopts, prev, node, | ||||
match=matchfn, stat=True) | ||||
self.ui.write(',\n "diffstat": "%s"' % j(self.ui.popbuffer())) | ||||
if diff: | ||||
self.ui.pushbuffer() | ||||
diffordiffstat(self.ui, self.repo, diffopts, prev, node, | ||||
match=matchfn, stat=False) | ||||
self.ui.write(',\n "diff": "%s"' % j(self.ui.popbuffer())) | ||||
self.ui.write("\n }") | ||||
Thomas Arendsen Hein
|
r4825 | |||
Matt Mackall
|
r3645 | class changeset_templater(changeset_printer): | ||
Matt Mackall
|
r3643 | '''format changeset information.''' | ||
Martin von Zweigbergk
|
r22386 | def __init__(self, ui, repo, matchfn, diffopts, tmpl, mapfile, buffered): | ||
changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered) | ||||
Dirkjan Ochtman
|
r8360 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) | ||
Patrick Mezard
|
r10061 | defaulttempl = { | ||
'parent': '{rev}:{node|formatnode} ', | ||||
'manifest': '{rev}:{node|formatnode}', | ||||
'file_copy': '{name} ({source})', | ||||
'extra': '{key}={value|stringescape}' | ||||
} | ||||
# filecopy is preserved for compatibility reasons | ||||
defaulttempl['filecopy'] = defaulttempl['file_copy'] | ||||
Dirkjan Ochtman
|
r8360 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, | ||
Patrick Mezard
|
r10061 | cache=defaulttempl) | ||
Matt Mackall
|
r20667 | if tmpl: | ||
self.t.cache['changeset'] = tmpl | ||||
Matt Mackall
|
r3643 | |||
Matt Mackall
|
r20667 | self.cache = {} | ||
Matt Mackall
|
r3643 | |||
Mads Kiilerich
|
r11488 | def _show(self, ctx, copies, matchfn, props): | ||
Matt Mackall
|
r3643 | '''show a single changeset or file revision''' | ||
Patrick Mezard
|
r10053 | showlist = templatekw.showlist | ||
Matt Mackall
|
r3643 | |||
Patrick Mezard
|
r10058 | # showparents() behaviour depends on ui trace level which | ||
# causes unexpected behaviours at templating level and makes | ||||
# it harder to extract it in a standalone function. Its | ||||
# behaviour cannot be changed so leave it here for now. | ||||
Matt Mackall
|
r3643 | def showparents(**args): | ||
Patrick Mezard
|
r10260 | ctx = args['ctx'] | ||
Jordi Gutiérrez Hermoso
|
r22764 | parents = [[('rev', p.rev()), | ||
('node', p.hex()), | ||||
('phase', p.phasestr())] | ||||
Alexander Solovyov
|
r7878 | for p in self._meaningful_parentrevs(ctx)] | ||
Matt Mackall
|
r3643 | return showlist('parent', parents, **args) | ||
props = props.copy() | ||||
Patrick Mezard
|
r10054 | props.update(templatekw.keywords) | ||
Patrick Mezard
|
r10058 | props['parents'] = showparents | ||
Patrick Mezard
|
r10053 | props['templ'] = self.t | ||
Patrick Mezard
|
r10054 | props['ctx'] = ctx | ||
Patrick Mezard
|
r10055 | props['repo'] = self.repo | ||
Patrick Mezard
|
r10058 | props['revcache'] = {'copies': copies} | ||
Patrick Mezard
|
r10057 | props['cache'] = self.cache | ||
Matt Mackall
|
r3643 | |||
Dirkjan Ochtman
|
r8013 | # find correct templates for current mode | ||
tmplmodes = [ | ||||
(True, None), | ||||
(self.ui.verbose, 'verbose'), | ||||
(self.ui.quiet, 'quiet'), | ||||
(self.ui.debugflag, 'debug'), | ||||
] | ||||
Robert Bachmann
|
r10152 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} | ||
Dirkjan Ochtman
|
r8013 | for mode, postfix in tmplmodes: | ||
for type in types: | ||||
cur = postfix and ('%s_%s' % (type, postfix)) or type | ||||
if mode and cur in self.t: | ||||
types[type] = cur | ||||
Matt Mackall
|
r3643 | try: | ||
Dirkjan Ochtman
|
r8013 | |||
# write header | ||||
if types['header']: | ||||
h = templater.stringify(self.t(types['header'], **props)) | ||||
Matt Mackall
|
r3645 | if self.buffered: | ||
Alexander Solovyov
|
r7878 | self.header[ctx.rev()] = h | ||
Matt Mackall
|
r3645 | else: | ||
Simon Howkins
|
r11465 | if self.lastheader != h: | ||
self.lastheader = h | ||||
Simon Howkins
|
r11441 | self.ui.write(h) | ||
Dirkjan Ochtman
|
r8013 | |||
# write changeset metadata, then patch if requested | ||||
key = types['changeset'] | ||||
Matt Mackall
|
r3645 | self.ui.write(templater.stringify(self.t(key, **props))) | ||
Mads Kiilerich
|
r11488 | self.showpatch(ctx.node(), matchfn) | ||
Dirkjan Ochtman
|
r8013 | |||
Robert Bachmann
|
r10160 | if types['footer']: | ||
Robert Bachmann
|
r10152 | if not self.footer: | ||
self.footer = templater.stringify(self.t(types['footer'], | ||||
**props)) | ||||
Matt Mackall
|
r3643 | except KeyError, inst: | ||
Dirkjan Ochtman
|
r8013 | msg = _("%s: no key named '%s'") | ||
raise util.Abort(msg % (self.t.mapfile, inst.args[0])) | ||||
Matt Mackall
|
r3643 | except SyntaxError, inst: | ||
Martin Geisler
|
r10829 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) | ||
Matt Mackall
|
r3643 | |||
Matt Mackall
|
r20666 | def gettemplate(ui, tmpl, style): | ||
""" | ||||
Find the template matching the given template spec or style. | ||||
""" | ||||
# ui settings | ||||
Yuya Nishihara
|
r22582 | if not tmpl and not style: # template are stronger than style | ||
Matt Mackall
|
r20666 | tmpl = ui.config('ui', 'logtemplate') | ||
if tmpl: | ||||
try: | ||||
tmpl = templater.parsestring(tmpl) | ||||
except SyntaxError: | ||||
tmpl = templater.parsestring(tmpl, quoted=False) | ||||
Matt Mackall
|
r20668 | return tmpl, None | ||
Matt Mackall
|
r20666 | else: | ||
style = util.expandpath(ui.config('ui', 'style', '')) | ||||
Yuya Nishihara
|
r22582 | if not tmpl and style: | ||
Matt Mackall
|
r20666 | mapfile = style | ||
if not os.path.split(mapfile)[0]: | ||||
mapname = (templater.templatepath('map-cmdline.' + mapfile) | ||||
or templater.templatepath(mapfile)) | ||||
if mapname: | ||||
mapfile = mapname | ||||
return None, mapfile | ||||
Matt Mackall
|
r20668 | if not tmpl: | ||
return None, None | ||||
# looks like a literal template? | ||||
if '{' in tmpl: | ||||
return tmpl, None | ||||
# perhaps a stock style? | ||||
if not os.path.split(tmpl)[0]: | ||||
mapname = (templater.templatepath('map-cmdline.' + tmpl) | ||||
or templater.templatepath(tmpl)) | ||||
if mapname and os.path.isfile(mapname): | ||||
return None, mapname | ||||
# perhaps it's a reference to [templates] | ||||
t = ui.config('templates', tmpl) | ||||
if t: | ||||
try: | ||||
tmpl = templater.parsestring(t) | ||||
except SyntaxError: | ||||
tmpl = templater.parsestring(t, quoted=False) | ||||
return tmpl, None | ||||
Matt Mackall
|
r21944 | if tmpl == 'list': | ||
ui.write(_("available styles: %s\n") % templater.stylelist()) | ||||
raise util.Abort(_("specify a template")) | ||||
Matt Mackall
|
r20668 | # perhaps it's a path to a map or a template | ||
if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): | ||||
# is it a mapfile for a style? | ||||
if os.path.basename(tmpl).startswith("map-"): | ||||
return None, os.path.realpath(tmpl) | ||||
tmpl = open(tmpl).read() | ||||
return tmpl, None | ||||
# constant string? | ||||
Matt Mackall
|
r20666 | return tmpl, None | ||
Mads Kiilerich
|
r11488 | def show_changeset(ui, repo, opts, buffered=False): | ||
Matt Mackall
|
r3643 | """show one changeset using template or regular display. | ||
Display format will be the first non-empty hit of: | ||||
1. option 'template' | ||||
2. option 'style' | ||||
3. [ui] setting 'logtemplate' | ||||
4. [ui] setting 'style' | ||||
If all of these values are either the unset or the empty string, | ||||
regular display via changeset_printer() is done. | ||||
""" | ||||
# options | ||||
Martin von Zweigbergk
|
r22386 | matchfn = None | ||
Yuya Nishihara
|
r11061 | if opts.get('patch') or opts.get('stat'): | ||
Martin von Zweigbergk
|
r22386 | matchfn = scmutil.matchall(repo) | ||
Matt Mackall
|
r3837 | |||
Matt Mackall
|
r22427 | if opts.get('template') == 'json': | ||
return jsonchangeset(ui, repo, matchfn, opts, buffered) | ||||
Matt Mackall
|
r3837 | |||
Matt Mackall
|
r20666 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) | ||
Dirkjan Ochtman
|
r7967 | |||
Matt Mackall
|
r20666 | if not tmpl and not mapfile: | ||
Martin von Zweigbergk
|
r22386 | return changeset_printer(ui, repo, matchfn, opts, buffered) | ||
Matt Mackall
|
r3643 | |||
Dirkjan Ochtman
|
r7967 | try: | ||
Martin von Zweigbergk
|
r22386 | t = changeset_templater(ui, repo, matchfn, opts, tmpl, mapfile, | ||
buffered) | ||||
Dirkjan Ochtman
|
r7967 | except SyntaxError, inst: | ||
raise util.Abort(inst.args[0]) | ||||
return t | ||||
Matt Mackall
|
r3643 | |||
Pierre-Yves David
|
r20470 | def showmarker(ui, marker): | ||
"""utility function to display obsolescence marker in a readable way | ||||
To be used by debug function.""" | ||||
ui.write(hex(marker.precnode())) | ||||
for repl in marker.succnodes(): | ||||
ui.write(' ') | ||||
ui.write(hex(repl)) | ||||
Pierre-Yves David
|
r22215 | ui.write(' %X ' % marker.flags()) | ||
Pierre-Yves David
|
r22260 | parents = marker.parentnodes() | ||
if parents is not None: | ||||
ui.write('{%s} ' % ', '.join(hex(p) for p in parents)) | ||||
Pierre-Yves David
|
r22220 | ui.write('(%s) ' % util.datestr(marker.date())) | ||
Pierre-Yves David
|
r20470 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in | ||
Pierre-Yves David
|
r22220 | sorted(marker.metadata().items()) | ||
if t[0] != 'date'))) | ||||
Pierre-Yves David
|
r20470 | ui.write('\n') | ||
Matt Mackall
|
r3814 | def finddate(ui, repo, date): | ||
"""Find the tipmost changeset that matches the given date spec""" | ||||
Dirkjan Ochtman
|
r9667 | |||
mark.williamson@cl.cam.ac.uk
|
r5836 | df = util.matchdate(date) | ||
Matt Mackall
|
r14322 | m = scmutil.matchall(repo) | ||
Matt Mackall
|
r3814 | results = {} | ||
Matt Mackall
|
r9662 | |||
def prep(ctx, fns): | ||||
d = ctx.date() | ||||
if df(d[0]): | ||||
Dirkjan Ochtman
|
r9668 | results[ctx.rev()] = d | ||
Matt Mackall
|
r9662 | |||
Dirkjan Ochtman
|
r9667 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): | ||
Matt Mackall
|
r9662 | rev = ctx.rev() | ||
if rev in results: | ||||
Martin Geisler
|
r16937 | ui.status(_("found revision %s from %s\n") % | ||
Matt Mackall
|
r9662 | (rev, util.datestr(results[rev]))) | ||
return str(rev) | ||||
Matt Mackall
|
r3814 | |||
raise util.Abort(_("revision matching date not found")) | ||||
Lucas Moscovicz
|
r20553 | def increasingwindows(windowsize=8, sizelimit=512): | ||
while True: | ||||
yield windowsize | ||||
if windowsize < sizelimit: | ||||
windowsize *= 2 | ||||
Patrick Mezard
|
r16776 | |||
Durham Goode
|
r19290 | class FileWalkError(Exception): | ||
pass | ||||
def walkfilerevs(repo, match, follow, revs, fncache): | ||||
'''Walks the file history for the matched files. | ||||
Returns the changeset revs that are involved in the file history. | ||||
Throws FileWalkError if the file history can't be walked using | ||||
filelogs alone. | ||||
''' | ||||
wanted = set() | ||||
copies = [] | ||||
minrev, maxrev = min(revs), max(revs) | ||||
def filerevgen(filelog, last): | ||||
""" | ||||
Only files, no patterns. Check the history of each file. | ||||
Examines filelog entries within minrev, maxrev linkrev range | ||||
Returns an iterator yielding (linkrev, parentlinkrevs, copied) | ||||
tuples in backwards order | ||||
""" | ||||
cl_count = len(repo) | ||||
revs = [] | ||||
for j in xrange(0, last + 1): | ||||
linkrev = filelog.linkrev(j) | ||||
if linkrev < minrev: | ||||
continue | ||||
# only yield rev for which we have the changelog, it can | ||||
# happen while doing "hg log" during a pull or commit | ||||
if linkrev >= cl_count: | ||||
break | ||||
parentlinkrevs = [] | ||||
for p in filelog.parentrevs(j): | ||||
if p != nullrev: | ||||
parentlinkrevs.append(filelog.linkrev(p)) | ||||
n = filelog.node(j) | ||||
revs.append((linkrev, parentlinkrevs, | ||||
follow and filelog.renamed(n))) | ||||
return reversed(revs) | ||||
def iterfiles(): | ||||
pctx = repo['.'] | ||||
for filename in match.files(): | ||||
if follow: | ||||
if filename not in pctx: | ||||
raise util.Abort(_('cannot follow file not in parent ' | ||||
'revision: "%s"') % filename) | ||||
yield filename, pctx[filename].filenode() | ||||
else: | ||||
yield filename, None | ||||
for filename_node in copies: | ||||
yield filename_node | ||||
for file_, node in iterfiles(): | ||||
filelog = repo.file(file_) | ||||
if not len(filelog): | ||||
if node is None: | ||||
# A zero count may be a directory or deleted file, so | ||||
# try to find matching entries on the slow path. | ||||
if follow: | ||||
raise util.Abort( | ||||
_('cannot follow nonexistent file: "%s"') % file_) | ||||
raise FileWalkError("Cannot walk via filelog") | ||||
else: | ||||
continue | ||||
if node is None: | ||||
last = len(filelog) - 1 | ||||
else: | ||||
last = filelog.rev(node) | ||||
# keep track of all ancestors of the file | ||||
ancestors = set([filelog.linkrev(last)]) | ||||
# iterate from latest to oldest revision | ||||
for rev, flparentlinkrevs, copied in filerevgen(filelog, last): | ||||
if not follow: | ||||
if rev > maxrev: | ||||
continue | ||||
else: | ||||
# Note that last might not be the first interesting | ||||
# rev to us: | ||||
# if the file has been changed after maxrev, we'll | ||||
# have linkrev(last) > maxrev, and we still need | ||||
# to explore the file graph | ||||
if rev not in ancestors: | ||||
continue | ||||
# XXX insert 1327 fix here | ||||
if flparentlinkrevs: | ||||
ancestors.update(flparentlinkrevs) | ||||
fncache.setdefault(rev, []).append(file_) | ||||
wanted.add(rev) | ||||
if copied: | ||||
copies.append(copied) | ||||
return wanted | ||||
Martin von Zweigbergk
|
r24391 | class _followfilter(object): | ||
def __init__(self, repo, onlyfirst=False): | ||||
self.repo = repo | ||||
self.startrev = nullrev | ||||
self.roots = set() | ||||
self.onlyfirst = onlyfirst | ||||
def match(self, rev): | ||||
def realparents(rev): | ||||
if self.onlyfirst: | ||||
return self.repo.changelog.parentrevs(rev)[0:1] | ||||
else: | ||||
return filter(lambda x: x != nullrev, | ||||
self.repo.changelog.parentrevs(rev)) | ||||
if self.startrev == nullrev: | ||||
self.startrev = rev | ||||
return True | ||||
if rev > self.startrev: | ||||
# forward: all descendants | ||||
if not self.roots: | ||||
self.roots.add(self.startrev) | ||||
for parent in realparents(rev): | ||||
if parent in self.roots: | ||||
self.roots.add(rev) | ||||
return True | ||||
else: | ||||
# backwards: all parents | ||||
if not self.roots: | ||||
self.roots.update(realparents(self.startrev)) | ||||
if rev in self.roots: | ||||
self.roots.remove(rev) | ||||
self.roots.update(realparents(rev)) | ||||
return True | ||||
return False | ||||
Matt Mackall
|
r9665 | def walkchangerevs(repo, match, opts, prepare): | ||
timeless
|
r7807 | '''Iterate over files and the revs in which they changed. | ||
Matt Mackall
|
r3650 | |||
Callers most commonly need to iterate backwards over the history | ||||
timeless
|
r7807 | in which they are interested. Doing so has awful (quadratic-looking) | ||
Matt Mackall
|
r3650 | performance, so we use iterators in a "windowed" way. | ||
We walk a window of revisions in the desired order. Within the | ||||
window, we first walk forwards to gather data, then in the desired | ||||
order (usually backwards) to display it. | ||||
Matt Mackall
|
r9662 | This function returns an iterator yielding contexts. Before | ||
yielding each context, the iterator will first call the prepare | ||||
function on each context in the window in forward order.''' | ||||
Matt Mackall
|
r3650 | |||
follow = opts.get('follow') or opts.get('follow_first') | ||||
Yuya Nishihara
|
r24063 | revs = _logrevs(repo, opts) | ||
Matt Mackall
|
r11281 | if not revs: | ||
return [] | ||||
Martin Geisler
|
r8152 | wanted = set() | ||
Matt Mackall
|
r9652 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | ||
Matt Mackall
|
r3650 | fncache = {} | ||
Matt Mackall
|
r16108 | change = repo.changectx | ||
Matt Mackall
|
r3650 | |||
Nicolas Dumazet
|
r11632 | # First step is to fill wanted, the set of revisions that we want to yield. | ||
# When it does not induce extra cost, we also fill fncache for revisions in | ||||
# wanted: a cache of filenames that were changed (ctx.files()) and that | ||||
# match the file filtering conditions. | ||||
Martin von Zweigbergk
|
r24384 | if match.always(): | ||
Matt Mackall
|
r3650 | # No files, no patterns. Display all revs. | ||
Lucas Moscovicz
|
r20553 | wanted = revs | ||
Matt Mackall
|
r9665 | |||
Matt Mackall
|
r16381 | if not slowpath and match.files(): | ||
Nicolas Dumazet
|
r11632 | # We only have to read through the filelog to find wanted revisions | ||
Durham Goode
|
r19290 | try: | ||
wanted = walkfilerevs(repo, match, follow, revs, fncache) | ||||
except FileWalkError: | ||||
slowpath = True | ||||
Nicolas Dumazet
|
r11608 | |||
Durham Goode
|
r19290 | # We decided to fall back to the slowpath because at least one | ||
# of the paths was not a file. Check to see if at least one of them | ||||
# existed in history, otherwise simply return | ||||
smuralid
|
r17746 | for path in match.files(): | ||
if path == '.' or path in repo.store: | ||||
break | ||||
Mads Kiilerich
|
r18340 | else: | ||
return [] | ||||
smuralid
|
r17746 | |||
Matt Mackall
|
r3650 | if slowpath: | ||
Nicolas Dumazet
|
r11632 | # We have to read the changelog to match filenames against | ||
# changed files | ||||
Matt Mackall
|
r3650 | if follow: | ||
raise util.Abort(_('can only follow copies/renames for explicit ' | ||||
timeless
|
r8761 | 'filenames')) | ||
Matt Mackall
|
r3650 | |||
# The slow path checks files modified in every changeset. | ||||
Durham Goode
|
r19730 | # This is really slow on large repos, so compute the set lazily. | ||
class lazywantedset(object): | ||||
def __init__(self): | ||||
self.set = set() | ||||
self.revs = set(revs) | ||||
# No need to worry about locality here because it will be accessed | ||||
# in the same order as the increasing window below. | ||||
def __contains__(self, value): | ||||
if value in self.set: | ||||
return True | ||||
elif not value in self.revs: | ||||
return False | ||||
else: | ||||
self.revs.discard(value) | ||||
ctx = change(value) | ||||
matches = filter(match, ctx.files()) | ||||
if matches: | ||||
fncache[value] = matches | ||||
self.set.add(value) | ||||
return True | ||||
return False | ||||
def discard(self, value): | ||||
self.revs.discard(value) | ||||
self.set.discard(value) | ||||
wanted = lazywantedset() | ||||
Matt Mackall
|
r3650 | |||
# it might be worthwhile to do this in the iterator if the rev range | ||||
# is descending and the prune args are all within that range | ||||
for rev in opts.get('prune', ()): | ||||
Matt Mackall
|
r16380 | rev = repo[rev].rev() | ||
Martin von Zweigbergk
|
r24391 | ff = _followfilter(repo) | ||
Matt Mackall
|
r3650 | stop = min(revs[0], revs[-1]) | ||
Matt Mackall
|
r10282 | for x in xrange(rev, stop - 1, -1): | ||
Martin Geisler
|
r8152 | if ff.match(x): | ||
Lucas Moscovicz
|
r20553 | wanted = wanted - [x] | ||
Bryan O'Sullivan
|
r18710 | |||
Nicolas Dumazet
|
r11632 | # Now that wanted is correctly initialized, we can iterate over the | ||
# revision range, yielding only revisions in wanted. | ||||
Matt Mackall
|
r3650 | def iterate(): | ||
Matt Mackall
|
r9652 | if follow and not match.files(): | ||
Martin von Zweigbergk
|
r24391 | ff = _followfilter(repo, onlyfirst=opts.get('follow_first')) | ||
Matt Mackall
|
r3650 | def want(rev): | ||
Martin Geisler
|
r8119 | return ff.match(rev) and rev in wanted | ||
Matt Mackall
|
r3650 | else: | ||
def want(rev): | ||||
return rev in wanted | ||||
Lucas Moscovicz
|
r20553 | it = iter(revs) | ||
stopiteration = False | ||||
for windowsize in increasingwindows(): | ||||
nrevs = [] | ||||
for i in xrange(windowsize): | ||||
try: | ||||
rev = it.next() | ||||
if want(rev): | ||||
nrevs.append(rev) | ||||
except (StopIteration): | ||||
stopiteration = True | ||||
break | ||||
Matt Mackall
|
r8209 | for rev in sorted(nrevs): | ||
Matt Mackall
|
r3650 | fns = fncache.get(rev) | ||
Matt Mackall
|
r9654 | ctx = change(rev) | ||
Matt Mackall
|
r3650 | if not fns: | ||
def fns_generator(): | ||||
Matt Mackall
|
r9654 | for f in ctx.files(): | ||
Matt Mackall
|
r9652 | if match(f): | ||
Matt Mackall
|
r3650 | yield f | ||
fns = fns_generator() | ||||
Matt Mackall
|
r9662 | prepare(ctx, fns) | ||
Matt Mackall
|
r3650 | for rev in nrevs: | ||
Matt Mackall
|
r9662 | yield change(rev) | ||
Lucas Moscovicz
|
r20553 | |||
if stopiteration: | ||||
break | ||||
Matt Mackall
|
r9652 | return iterate() | ||
Bryan O'Sullivan
|
r5034 | |||
Siddharth Agarwal
|
r22166 | def _makefollowlogfilematcher(repo, files, followfirst): | ||
Patrick Mezard
|
r17180 | # When displaying a revision with --patch --follow FILE, we have | ||
# to know which file of the revision must be diffed. With | ||||
# --follow, we want the names of the ancestors of FILE in the | ||||
# revision, stored in "fcache". "fcache" is populated by | ||||
# reproducing the graph traversal already done by --follow revset | ||||
# and relating linkrevs to file names (which is not "correct" but | ||||
# good enough). | ||||
fcache = {} | ||||
fcacheready = [False] | ||||
pctx = repo['.'] | ||||
def populate(): | ||||
Siddharth Agarwal
|
r21876 | for fn in files: | ||
Patrick Mezard
|
r17180 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): | ||
for c in i: | ||||
fcache.setdefault(c.linkrev(), set()).add(c.path()) | ||||
def filematcher(rev): | ||||
if not fcacheready[0]: | ||||
# Lazy initialization | ||||
fcacheready[0] = True | ||||
populate() | ||||
Siddharth Agarwal
|
r21878 | return scmutil.matchfiles(repo, fcache.get(rev, [])) | ||
Patrick Mezard
|
r17180 | |||
return filematcher | ||||
Siddharth Agarwal
|
r22167 | def _makenofollowlogfilematcher(repo, pats, opts): | ||
'''hook for extensions to override the filematcher for non-follow cases''' | ||||
return None | ||||
Lucas Moscovicz
|
r21108 | def _makelogrevset(repo, pats, opts, revs): | ||
Patrick Mezard
|
r17180 | """Return (expr, filematcher) where expr is a revset string built | ||
from log options and file patterns or None. If --stat or --patch | ||||
are not passed filematcher is None. Otherwise it is a callable | ||||
taking a revision number and returning a match objects filtering | ||||
the files to be detailed when displaying the revision. | ||||
""" | ||||
opt2revset = { | ||||
'no_merges': ('not merge()', None), | ||||
'only_merges': ('merge()', None), | ||||
'_ancestors': ('ancestors(%(val)s)', None), | ||||
'_fancestors': ('_firstancestors(%(val)s)', None), | ||||
'_descendants': ('descendants(%(val)s)', None), | ||||
'_fdescendants': ('_firstdescendants(%(val)s)', None), | ||||
'_matchfiles': ('_matchfiles(%(val)s)', None), | ||||
'date': ('date(%(val)r)', None), | ||||
'branch': ('branch(%(val)r)', ' or '), | ||||
'_patslog': ('filelog(%(val)r)', ' or '), | ||||
'_patsfollow': ('follow(%(val)r)', ' or '), | ||||
'_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), | ||||
'keyword': ('keyword(%(val)r)', ' or '), | ||||
'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), | ||||
'user': ('user(%(val)r)', ' or '), | ||||
} | ||||
opts = dict(opts) | ||||
# follow or not follow? | ||||
follow = opts.get('follow') or opts.get('follow_first') | ||||
Jordi Gutiérrez Hermoso
|
r24306 | if opts.get('follow_first'): | ||
followfirst = 1 | ||||
else: | ||||
followfirst = 0 | ||||
Patrick Mezard
|
r17180 | # --follow with FILE behaviour depends on revs... | ||
Lucas Moscovicz
|
r20756 | it = iter(revs) | ||
startrev = it.next() | ||||
try: | ||||
followdescendants = startrev < it.next() | ||||
except (StopIteration): | ||||
followdescendants = False | ||||
Patrick Mezard
|
r17180 | |||
# branch and only_branch are really aliases and must be handled at | ||||
# the same time | ||||
opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) | ||||
opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] | ||||
# pats/include/exclude are passed to match.match() directly in | ||||
Mads Kiilerich
|
r17424 | # _matchfiles() revset but walkchangerevs() builds its matcher with | ||
Patrick Mezard
|
r17180 | # scmutil.match(). The difference is input pats are globbed on | ||
# platforms without shell expansion (windows). | ||||
Martin von Zweigbergk
|
r24534 | wctx = repo[None] | ||
match, pats = scmutil.matchandpats(wctx, pats, opts) | ||||
Patrick Mezard
|
r17180 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | ||
if not slowpath: | ||||
for f in match.files(): | ||||
Martin von Zweigbergk
|
r24534 | if follow and f not in wctx: | ||
Durham Goode
|
r21998 | # If the file exists, it may be a directory, so let it | ||
# take the slow path. | ||||
if os.path.exists(repo.wjoin(f)): | ||||
slowpath = True | ||||
continue | ||||
else: | ||||
raise util.Abort(_('cannot follow file not in parent ' | ||||
'revision: "%s"') % f) | ||||
Patrick Mezard
|
r17180 | filelog = repo.file(f) | ||
Durham Goode
|
r19293 | if not filelog: | ||
Patrick Mezard
|
r17180 | # A zero count may be a directory or deleted file, so | ||
# try to find matching entries on the slow path. | ||||
if follow: | ||||
raise util.Abort( | ||||
_('cannot follow nonexistent file: "%s"') % f) | ||||
slowpath = True | ||||
smuralid
|
r17746 | |||
# We decided to fall back to the slowpath because at least one | ||||
# of the paths was not a file. Check to see if at least one of them | ||||
# existed in history - in that case, we'll continue down the | ||||
# slowpath; otherwise, we can turn off the slowpath | ||||
if slowpath: | ||||
for path in match.files(): | ||||
if path == '.' or path in repo.store: | ||||
break | ||||
else: | ||||
slowpath = False | ||||
Durham Goode
|
r23500 | fpats = ('_patsfollow', '_patsfollowfirst') | ||
fnopats = (('_ancestors', '_fancestors'), | ||||
('_descendants', '_fdescendants')) | ||||
Patrick Mezard
|
r17180 | if slowpath: | ||
# See walkchangerevs() slow path. | ||||
# | ||||
# pats/include/exclude cannot be represented as separate | ||||
# revset expressions as their filtering logic applies at file | ||||
# level. For instance "-I a -X a" matches a revision touching | ||||
# "a" and "b" while "file(a) and not file(b)" does | ||||
# not. Besides, filesets are evaluated against the working | ||||
# directory. | ||||
matchargs = ['r:', 'd:relpath'] | ||||
for p in pats: | ||||
matchargs.append('p:' + p) | ||||
for p in opts.get('include', []): | ||||
matchargs.append('i:' + p) | ||||
for p in opts.get('exclude', []): | ||||
matchargs.append('x:' + p) | ||||
matchargs = ','.join(('%r' % p) for p in matchargs) | ||||
opts['_matchfiles'] = matchargs | ||||
Durham Goode
|
r23500 | if follow: | ||
opts[fnopats[0][followfirst]] = '.' | ||||
Patrick Mezard
|
r17180 | else: | ||
if follow: | ||||
if pats: | ||||
Mads Kiilerich
|
r17424 | # follow() revset interprets its file argument as a | ||
Patrick Mezard
|
r17180 | # manifest entry, so use match.files(), not pats. | ||
opts[fpats[followfirst]] = list(match.files()) | ||||
else: | ||||
Yuya Nishihara
|
r23955 | op = fnopats[followdescendants][followfirst] | ||
opts[op] = 'rev(%d)' % startrev | ||||
Patrick Mezard
|
r17180 | else: | ||
opts['_patslog'] = list(pats) | ||||
filematcher = None | ||||
if opts.get('patch') or opts.get('stat'): | ||||
Durham Goode
|
r21998 | # When following files, track renames via a special matcher. | ||
# If we're forced to take the slowpath it means we're following | ||||
# at least one pattern/directory, so don't bother with rename tracking. | ||||
if follow and not match.always() and not slowpath: | ||||
Mads Kiilerich
|
r23139 | # _makefollowlogfilematcher expects its files argument to be | ||
# relative to the repo root, so use match.files(), not pats. | ||||
Siddharth Agarwal
|
r22166 | filematcher = _makefollowlogfilematcher(repo, match.files(), | ||
followfirst) | ||||
Patrick Mezard
|
r17180 | else: | ||
Siddharth Agarwal
|
r22167 | filematcher = _makenofollowlogfilematcher(repo, pats, opts) | ||
if filematcher is None: | ||||
filematcher = lambda rev: match | ||||
Patrick Mezard
|
r17180 | |||
expr = [] | ||||
Durham Goode
|
r23501 | for op, val in sorted(opts.iteritems()): | ||
Patrick Mezard
|
r17180 | if not val: | ||
continue | ||||
if op not in opt2revset: | ||||
continue | ||||
revop, andor = opt2revset[op] | ||||
if '%(val)' not in revop: | ||||
expr.append(revop) | ||||
else: | ||||
if not isinstance(val, list): | ||||
e = revop % {'val': val} | ||||
else: | ||||
e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' | ||||
expr.append(e) | ||||
if expr: | ||||
expr = '(' + ' and '.join(expr) + ')' | ||||
else: | ||||
expr = None | ||||
return expr, filematcher | ||||
Yuya Nishihara
|
r24062 | def _logrevs(repo, opts): | ||
# Default --rev value depends on --follow but --follow behaviour | ||||
# depends on revisions resolved from --rev... | ||||
follow = opts.get('follow') or opts.get('follow_first') | ||||
if opts.get('rev'): | ||||
revs = scmutil.revrange(repo, opts['rev']) | ||||
Yuya Nishihara
|
r24064 | elif follow and repo.dirstate.p1() == nullid: | ||
revs = revset.baseset() | ||||
Yuya Nishihara
|
r24062 | elif follow: | ||
revs = repo.revs('reverse(:.)') | ||||
else: | ||||
revs = revset.spanset(repo) | ||||
revs.reverse() | ||||
return revs | ||||
Patrick Mezard
|
r17180 | def getgraphlogrevs(repo, pats, opts): | ||
"""Return (revs, expr, filematcher) where revs is an iterable of | ||||
revision numbers, expr is a revset string built from log options | ||||
and file patterns or None, and used to filter 'revs'. If --stat or | ||||
--patch are not passed filematcher is None. Otherwise it is a | ||||
callable taking a revision number and returning a match objects | ||||
filtering the files to be detailed when displaying the revision. | ||||
""" | ||||
Siddharth Agarwal
|
r18172 | limit = loglimit(opts) | ||
Yuya Nishihara
|
r24062 | revs = _logrevs(repo, opts) | ||
Patrick Mezard
|
r17180 | if not revs: | ||
Lucas Moscovicz
|
r20759 | return revset.baseset(), None, None | ||
Lucas Moscovicz
|
r21108 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) | ||
Yuya Nishihara
|
r24060 | if opts.get('rev'): | ||
# User-specified revs might be unsorted, but don't sort before | ||||
# _makelogrevset because it might depend on the order of revs | ||||
Siddharth Agarwal
|
r18169 | revs.sort(reverse=True) | ||
Patrick Mezard
|
r17180 | if expr: | ||
Siddharth Agarwal
|
r18171 | # Revset matchers often operate faster on revisions in changelog | ||
# order, because most filters deal with the changelog. | ||||
revs.reverse() | ||||
Patrick Mezard
|
r17180 | matcher = revset.match(repo.ui, expr) | ||
Siddharth Agarwal
|
r18171 | # Revset matches can reorder revisions. "A or B" typically returns | ||
# returns the revision matching A then the revision matching B. Sort | ||||
# again to fix that. | ||||
revs = matcher(repo, revs) | ||||
revs.sort(reverse=True) | ||||
Pierre-Yves David
|
r18243 | if limit is not None: | ||
Pierre-Yves David
|
r22807 | limitedrevs = [] | ||
Lucas Moscovicz
|
r20755 | for idx, rev in enumerate(revs): | ||
if idx >= limit: | ||||
break | ||||
limitedrevs.append(rev) | ||||
Pierre-Yves David
|
r22807 | revs = revset.baseset(limitedrevs) | ||
Siddharth Agarwal
|
r18172 | |||
Patrick Mezard
|
r17180 | return revs, expr, filematcher | ||
Lucas Moscovicz
|
r21127 | def getlogrevs(repo, pats, opts): | ||
"""Return (revs, expr, filematcher) where revs is an iterable of | ||||
revision numbers, expr is a revset string built from log options | ||||
and file patterns or None, and used to filter 'revs'. If --stat or | ||||
--patch are not passed filematcher is None. Otherwise it is a | ||||
callable taking a revision number and returning a match objects | ||||
filtering the files to be detailed when displaying the revision. | ||||
""" | ||||
limit = loglimit(opts) | ||||
Yuya Nishihara
|
r24062 | revs = _logrevs(repo, opts) | ||
Lucas Moscovicz
|
r21127 | if not revs: | ||
return revset.baseset([]), None, None | ||||
expr, filematcher = _makelogrevset(repo, pats, opts, revs) | ||||
if expr: | ||||
# Revset matchers often operate faster on revisions in changelog | ||||
# order, because most filters deal with the changelog. | ||||
if not opts.get('rev'): | ||||
revs.reverse() | ||||
matcher = revset.match(repo.ui, expr) | ||||
# Revset matches can reorder revisions. "A or B" typically returns | ||||
# returns the revision matching A then the revision matching B. Sort | ||||
# again to fix that. | ||||
revs = matcher(repo, revs) | ||||
if not opts.get('rev'): | ||||
revs.sort(reverse=True) | ||||
if limit is not None: | ||||
count = 0 | ||||
Pierre-Yves David
|
r22806 | limitedrevs = [] | ||
Lucas Moscovicz
|
r21127 | it = iter(revs) | ||
while count < limit: | ||||
try: | ||||
limitedrevs.append(it.next()) | ||||
except (StopIteration): | ||||
break | ||||
count += 1 | ||||
Pierre-Yves David
|
r22806 | revs = revset.baseset(limitedrevs) | ||
Lucas Moscovicz
|
r21127 | |||
return revs, expr, filematcher | ||||
Patrick Mezard
|
r17180 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, | ||
filematcher=None): | ||||
seen, state = [], graphmod.asciistate() | ||||
for rev, type, ctx, parents in dag: | ||||
char = 'o' | ||||
if ctx.node() in showparents: | ||||
char = '@' | ||||
elif ctx.obsolete(): | ||||
char = 'x' | ||||
Jordi Gutiérrez Hermoso
|
r24216 | elif ctx.closesbranch(): | ||
char = '_' | ||||
Patrick Mezard
|
r17180 | copies = None | ||
if getrenamed and ctx.rev(): | ||||
copies = [] | ||||
for fn in ctx.files(): | ||||
rename = getrenamed(fn, ctx.rev()) | ||||
if rename: | ||||
copies.append((fn, rename[0])) | ||||
revmatchfn = None | ||||
if filematcher is not None: | ||||
revmatchfn = filematcher(ctx.rev()) | ||||
displayer.show(ctx, copies=copies, matchfn=revmatchfn) | ||||
lines = displayer.hunk.pop(rev).split('\n') | ||||
if not lines[-1]: | ||||
del lines[-1] | ||||
displayer.flush(rev) | ||||
edges = edgefn(type, char, lines, seen, rev, parents) | ||||
for type, char, lines, coldata in edges: | ||||
graphmod.ascii(ui, state, type, char, lines, coldata) | ||||
displayer.close() | ||||
Patrick Mezard
|
r17181 | def graphlog(ui, repo, *pats, **opts): | ||
# Parameters are identical to log command ones | ||||
revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) | ||||
revdag = graphmod.dagwalker(repo, revs) | ||||
getrenamed = None | ||||
if opts.get('copies'): | ||||
endrev = None | ||||
if opts.get('rev'): | ||||
Lucas Moscovicz
|
r20760 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | ||
Patrick Mezard
|
r17181 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | ||
displayer = show_changeset(ui, repo, opts, buffered=True) | ||||
showparents = [ctx.node() for ctx in repo[None].parents()] | ||||
displaygraph(ui, revdag, displayer, showparents, | ||||
graphmod.asciiedges, getrenamed, filematcher) | ||||
Patrick Mezard
|
r17182 | def checkunsupportedgraphflags(pats, opts): | ||
for op in ["newest_first"]: | ||||
if op in opts and opts[op]: | ||||
raise util.Abort(_("-G/--graph option is incompatible with --%s") | ||||
% op.replace("_", "-")) | ||||
def graphrevs(repo, nodes, opts): | ||||
limit = loglimit(opts) | ||||
nodes.reverse() | ||||
if limit is not None: | ||||
nodes = nodes[:limit] | ||||
return graphmod.nodes(repo, nodes) | ||||
Matt Harbison
|
r23885 | def add(ui, repo, match, prefix, explicitonly, **opts): | ||
Martin Geisler
|
r12270 | join = lambda f: os.path.join(prefix, f) | ||
Martin Geisler
|
r12269 | bad = [] | ||
oldbad = match.bad | ||||
match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | ||||
names = [] | ||||
Martin Geisler
|
r12270 | wctx = repo[None] | ||
Adrian Buehlmann
|
r14138 | cca = None | ||
abort, warn = scmutil.checkportabilityalert(ui) | ||||
if abort or warn: | ||||
Joshua Redstone
|
r17201 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) | ||
Martin von Zweigbergk
|
r23258 | for f in wctx.walk(match): | ||
Martin Geisler
|
r12269 | exact = match.exact(f) | ||
John Coomes
|
r23462 | if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f): | ||
Adrian Buehlmann
|
r14138 | if cca: | ||
cca(f) | ||||
Martin Geisler
|
r12269 | names.append(f) | ||
if ui.verbose or not exact: | ||||
Matt Harbison
|
r23686 | ui.status(_('adding %s\n') % match.rel(f)) | ||
Martin Geisler
|
r12270 | |||
Mads Kiilerich
|
r18364 | for subpath in sorted(wctx.substate): | ||
David M. Carr
|
r15410 | sub = wctx.sub(subpath) | ||
try: | ||||
submatch = matchmod.narrowmatcher(subpath, match) | ||||
Matt Harbison
|
r23885 | if opts.get('subrepos'): | ||
bad.extend(sub.add(ui, submatch, prefix, False, **opts)) | ||||
David M. Carr
|
r15410 | else: | ||
Matt Harbison
|
r23885 | bad.extend(sub.add(ui, submatch, prefix, True, **opts)) | ||
David M. Carr
|
r15410 | except error.LookupError: | ||
ui.status(_("skipping missing subrepository: %s\n") | ||||
% join(subpath)) | ||||
Martin Geisler
|
r12270 | |||
Matt Harbison
|
r23885 | if not opts.get('dry_run'): | ||
Martin Geisler
|
r12270 | rejected = wctx.add(names, prefix) | ||
Martin Geisler
|
r12269 | bad.extend(f for f in rejected if f in match.files()) | ||
return bad | ||||
David M. Carr
|
r15912 | def forget(ui, repo, match, prefix, explicitonly): | ||
join = lambda f: os.path.join(prefix, f) | ||||
bad = [] | ||||
oldbad = match.bad | ||||
match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | ||||
wctx = repo[None] | ||||
forgot = [] | ||||
s = repo.status(match=match, clean=True) | ||||
forget = sorted(s[0] + s[1] + s[3] + s[6]) | ||||
if explicitonly: | ||||
forget = [f for f in forget if match.exact(f)] | ||||
Mads Kiilerich
|
r18364 | for subpath in sorted(wctx.substate): | ||
David M. Carr
|
r15912 | sub = wctx.sub(subpath) | ||
try: | ||||
submatch = matchmod.narrowmatcher(subpath, match) | ||||
Matt Harbison
|
r23577 | subbad, subforgot = sub.forget(submatch, prefix) | ||
David M. Carr
|
r15912 | bad.extend([subpath + '/' + f for f in subbad]) | ||
forgot.extend([subpath + '/' + f for f in subforgot]) | ||||
except error.LookupError: | ||||
ui.status(_("skipping missing subrepository: %s\n") | ||||
% join(subpath)) | ||||
FUJIWARA Katsunori
|
r16070 | if not explicitonly: | ||
for f in match.files(): | ||||
Matt Harbison
|
r23673 | if f not in repo.dirstate and not repo.wvfs.isdir(f): | ||
David M. Carr
|
r15912 | if f not in forgot: | ||
Matt Harbison
|
r23673 | if repo.wvfs.exists(f): | ||
Matt Harbison
|
r24548 | # Don't complain if the exact case match wasn't given. | ||
# But don't do this until after checking 'forgot', so | ||||
# that subrepo files aren't normalized, and this op is | ||||
# purely from data cached by the status walk above. | ||||
if repo.dirstate.normalize(f) in repo.dirstate: | ||||
continue | ||||
David M. Carr
|
r15912 | ui.warn(_('not removing %s: ' | ||
'file is already untracked\n') | ||||
Matt Harbison
|
r23686 | % match.rel(f)) | ||
David M. Carr
|
r15912 | bad.append(f) | ||
for f in forget: | ||||
if ui.verbose or not match.exact(f): | ||||
Matt Harbison
|
r23686 | ui.status(_('removing %s\n') % match.rel(f)) | ||
David M. Carr
|
r15912 | |||
rejected = wctx.forget(forget, prefix) | ||||
bad.extend(f for f in rejected if f in match.files()) | ||||
Matt Harbison
|
r23838 | forgot.extend(f for f in forget if f not in rejected) | ||
David M. Carr
|
r15912 | return bad, forgot | ||
Matt Harbison
|
r24413 | def files(ui, ctx, m, fm, fmt, subrepos): | ||
Matt Harbison
|
r24275 | rev = ctx.rev() | ||
ret = 1 | ||||
Matt Harbison
|
r24301 | ds = ctx.repo().dirstate | ||
Matt Harbison
|
r24275 | |||
for f in ctx.matches(m): | ||||
if rev is None and ds[f] == 'r': | ||||
continue | ||||
fm.startitem() | ||||
if ui.verbose: | ||||
fc = ctx[f] | ||||
fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags()) | ||||
fm.data(abspath=f) | ||||
fm.write('path', fmt, m.rel(f)) | ||||
ret = 0 | ||||
Matt Harbison
|
r24413 | if subrepos: | ||
for subpath in sorted(ctx.substate): | ||||
sub = ctx.sub(subpath) | ||||
try: | ||||
submatch = matchmod.narrowmatcher(subpath, m) | ||||
if sub.printfiles(ui, submatch, fm, fmt) == 0: | ||||
ret = 0 | ||||
except error.LookupError: | ||||
ui.status(_("skipping missing subrepository: %s\n") | ||||
% m.abs(subpath)) | ||||
Matt Harbison
|
r24275 | return ret | ||
Matt Harbison
|
r23325 | def remove(ui, repo, m, prefix, after, force, subrepos): | ||
join = lambda f: os.path.join(prefix, f) | ||||
Matt Harbison
|
r23289 | ret = 0 | ||
s = repo.status(match=m, clean=True) | ||||
modified, added, deleted, clean = s[0], s[1], s[3], s[6] | ||||
Matt Harbison
|
r23325 | wctx = repo[None] | ||
Matt Harbison
|
r23326 | for subpath in sorted(wctx.substate): | ||
def matchessubrepo(matcher, subpath): | ||||
if matcher.exact(subpath): | ||||
return True | ||||
for f in matcher.files(): | ||||
if f.startswith(subpath): | ||||
return True | ||||
return False | ||||
if subrepos or matchessubrepo(m, subpath): | ||||
Matt Harbison
|
r23325 | sub = wctx.sub(subpath) | ||
try: | ||||
submatch = matchmod.narrowmatcher(subpath, m) | ||||
Matt Harbison
|
r23578 | if sub.removefiles(submatch, prefix, after, force, subrepos): | ||
Matt Harbison
|
r23325 | ret = 1 | ||
except error.LookupError: | ||||
ui.status(_("skipping missing subrepository: %s\n") | ||||
% join(subpath)) | ||||
Matt Harbison
|
r23289 | # warn about failure to delete explicit files/dirs | ||
Drew Gottlieb
|
r24635 | deleteddirs = util.dirs(deleted) | ||
Matt Harbison
|
r23289 | for f in m.files(): | ||
Matt Harbison
|
r23325 | def insubrepo(): | ||
for subpath in wctx.substate: | ||||
if f.startswith(subpath): | ||||
return True | ||||
return False | ||||
Durham Goode
|
r24213 | isdir = f in deleteddirs or f in wctx.dirs() | ||
if f in repo.dirstate or isdir or f == '.' or insubrepo(): | ||||
Matt Harbison
|
r23289 | continue | ||
Matt Harbison
|
r23325 | |||
Matt Harbison
|
r23674 | if repo.wvfs.exists(f): | ||
if repo.wvfs.isdir(f): | ||||
Matt Harbison
|
r23325 | ui.warn(_('not removing %s: no tracked files\n') | ||
Matt Harbison
|
r23686 | % m.rel(f)) | ||
Matt Harbison
|
r23289 | else: | ||
Matt Harbison
|
r23325 | ui.warn(_('not removing %s: file is untracked\n') | ||
Matt Harbison
|
r23686 | % m.rel(f)) | ||
Matt Harbison
|
r23289 | # missing files will generate a warning elsewhere | ||
ret = 1 | ||||
if force: | ||||
list = modified + deleted + clean + added | ||||
elif after: | ||||
list = deleted | ||||
for f in modified + added + clean: | ||||
Matt Harbison
|
r23686 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) | ||
Matt Harbison
|
r23289 | ret = 1 | ||
else: | ||||
list = deleted + clean | ||||
for f in modified: | ||||
ui.warn(_('not removing %s: file is modified (use -f' | ||||
Matt Harbison
|
r23686 | ' to force removal)\n') % m.rel(f)) | ||
Matt Harbison
|
r23289 | ret = 1 | ||
for f in added: | ||||
ui.warn(_('not removing %s: file has been marked for add' | ||||
Matt Harbison
|
r23686 | ' (use forget to undo)\n') % m.rel(f)) | ||
Matt Harbison
|
r23289 | ret = 1 | ||
for f in sorted(list): | ||||
if ui.verbose or not m.exact(f): | ||||
Matt Harbison
|
r23686 | ui.status(_('removing %s\n') % m.rel(f)) | ||
Matt Harbison
|
r23289 | |||
wlock = repo.wlock() | ||||
try: | ||||
if not after: | ||||
for f in list: | ||||
if f in added: | ||||
continue # we never unlink added files on remove | ||||
util.unlinkpath(repo.wjoin(f), ignoremissing=True) | ||||
repo[None].forget(list) | ||||
finally: | ||||
wlock.release() | ||||
return ret | ||||
Matt Harbison
|
r21041 | def cat(ui, repo, ctx, matcher, prefix, **opts): | ||
Matt Harbison
|
r21040 | err = 1 | ||
def write(path): | ||||
Matt Harbison
|
r21041 | fp = makefileobj(repo, opts.get('output'), ctx.node(), | ||
pathname=os.path.join(prefix, path)) | ||||
Matt Harbison
|
r21040 | data = ctx[path].data() | ||
if opts.get('decode'): | ||||
data = repo.wwritedata(path, data) | ||||
fp.write(data) | ||||
fp.close() | ||||
# Automation often uses hg cat on single files, so special case it | ||||
# for performance to avoid the cost of parsing the manifest. | ||||
if len(matcher.files()) == 1 and not matcher.anypats(): | ||||
file = matcher.files()[0] | ||||
mf = repo.manifest | ||||
Yuya Nishihara
|
r24718 | mfnode = ctx.manifestnode() | ||
Yuya Nishihara
|
r24720 | if mfnode and mf.find(mfnode, file)[0]: | ||
Matt Harbison
|
r21040 | write(file) | ||
return 0 | ||||
Matt Harbison
|
r21041 | # Don't warn about "missing" files that are really in subrepos | ||
bad = matcher.bad | ||||
def badfn(path, msg): | ||||
for subpath in ctx.substate: | ||||
if path.startswith(subpath): | ||||
return | ||||
bad(path, msg) | ||||
matcher.bad = badfn | ||||
Matt Harbison
|
r21040 | for abs in ctx.walk(matcher): | ||
write(abs) | ||||
err = 0 | ||||
Matt Harbison
|
r21041 | |||
matcher.bad = bad | ||||
for subpath in sorted(ctx.substate): | ||||
sub = ctx.sub(subpath) | ||||
try: | ||||
submatch = matchmod.narrowmatcher(subpath, matcher) | ||||
Matt Harbison
|
r23576 | if not sub.cat(submatch, os.path.join(prefix, sub._path), | ||
Matt Harbison
|
r21041 | **opts): | ||
err = 0 | ||||
except error.RepoLookupError: | ||||
ui.status(_("skipping missing subrepository: %s\n") | ||||
% os.path.join(prefix, subpath)) | ||||
Matt Harbison
|
r21040 | return err | ||
Bryan O'Sullivan
|
r5034 | def commit(ui, repo, commitfunc, pats, opts): | ||
'''commit the specified files or all outstanding changes''' | ||||
Thomas Arendsen Hein
|
r6139 | date = opts.get('date') | ||
if date: | ||||
opts['date'] = util.parsedate(date) | ||||
Idan Kamara
|
r14635 | message = logmessage(ui, opts) | ||
Matt Harbison
|
r23533 | matcher = scmutil.match(repo[None], pats, opts) | ||
Bryan O'Sullivan
|
r5034 | |||
Kirill Smelkov
|
r5829 | # extract addremove carefully -- this function can be called from a command | ||
# that doesn't support addremove | ||||
if opts.get('addremove'): | ||||
Matt Harbison
|
r23537 | if scmutil.addremove(repo, matcher, "", opts) != 0: | ||
Matt Harbison
|
r23535 | raise util.Abort( | ||
_("failed to mark all new/missing files as added/removed")) | ||||
Matt Harbison
|
r23533 | |||
return commitfunc(ui, repo, message, matcher, opts) | ||||
Matt Mackall
|
r8407 | |||
Idan Kamara
|
r16458 | def amend(ui, repo, commitfunc, old, extra, pats, opts): | ||
Matt Harbison
|
r23101 | # amend will reuse the existing user if not specified, but the obsolete | ||
# marker creation requires that the current user's name is specified. | ||||
Durham Goode
|
r24379 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | ||
Matt Harbison
|
r23101 | ui.username() # raise exception if username not set | ||
Idan Kamara
|
r16458 | ui.note(_('amending changeset %s\n') % old) | ||
base = old.p1() | ||||
Pierre-Yves David
|
r18197 | wlock = lock = newid = None | ||
Idan Kamara
|
r16458 | try: | ||
Pierre-Yves David
|
r17471 | wlock = repo.wlock() | ||
lock = repo.lock() | ||||
Pierre-Yves David
|
r17472 | tr = repo.transaction('amend') | ||
Idan Kamara
|
r17049 | try: | ||
Pierre-Yves David
|
r17473 | # See if we got a message from -m or -l, if not, open the editor | ||
# with the message of the changeset to amend | ||||
message = logmessage(ui, opts) | ||||
Pierre-Yves David
|
r17863 | # ensure logfile does not conflict with later enforcement of the | ||
# message. potential logfile content has been processed by | ||||
# `logmessage` anyway. | ||||
opts.pop('logfile') | ||||
Pierre-Yves David
|
r17472 | # First, do a regular commit to record all changes in the working | ||
# directory (if there are any) | ||||
ui.callhooks = False | ||||
Pierre-Yves David
|
r18198 | currentbookmark = repo._bookmarkcurrent | ||
Pierre-Yves David
|
r17472 | try: | ||
Pierre-Yves David
|
r18198 | repo._bookmarkcurrent = None | ||
Pierre-Yves David
|
r17473 | opts['message'] = 'temporary amend commit for %s' % old | ||
Pierre-Yves David
|
r17472 | node = commit(ui, repo, commitfunc, pats, opts) | ||
finally: | ||||
Pierre-Yves David
|
r18198 | repo._bookmarkcurrent = currentbookmark | ||
Pierre-Yves David
|
r17472 | ui.callhooks = True | ||
ctx = repo[node] | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | # Participating changesets: | ||
# | ||||
# node/ctx o - new (intermediate) commit that contains changes | ||||
# | from working dir to go into amending commit | ||||
# | (or a workingctx if there were no changes) | ||||
# | | ||||
# old o - changeset to amend | ||||
# | | ||||
# base o - parent of amending changeset | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | # Update extra dict from amended commit (e.g. to preserve graft | ||
# source) | ||||
extra.update(old.extra()) | ||||
Idan Kamara
|
r16630 | |||
Pierre-Yves David
|
r17472 | # Also update it from the intermediate commit or from the wctx | ||
extra.update(ctx.extra()) | ||||
Idan Kamara
|
r16630 | |||
Brodie Rao
|
r18909 | if len(old.parents()) > 1: | ||
# ctx.files() isn't reliable for merges, so fall back to the | ||||
# slower repo.status() method | ||||
files = set([fn for st in repo.status(base, old)[:3] | ||||
for fn in st]) | ||||
else: | ||||
files = set(old.files()) | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | # Second, we use either the commit we just did, or if there were no | ||
# changes the parent of the working directory as the version of the | ||||
# files in the final amend commit | ||||
if node: | ||||
ui.note(_('copying changeset %s to %s\n') % (ctx, base)) | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | user = ctx.user() | ||
date = ctx.date() | ||||
# Recompute copies (avoid recording a -> b -> a) | ||||
copied = copies.pathcopies(base, ctx) | ||||
Pierre-Yves David
|
r24169 | if old.p2: | ||
copied.update(copies.pathcopies(old.p2(), ctx)) | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | # Prune files which were reverted by the updates: if old | ||
# introduced file X and our intermediate commit, node, | ||||
# renamed that file, then those two files are the same and | ||||
# we can discard X from our list of files. Likewise if X | ||||
# was deleted, it's no longer relevant | ||||
files.update(ctx.files()) | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | def samefile(f): | ||
if f in ctx.manifest(): | ||||
a = ctx.filectx(f) | ||||
if f in base.manifest(): | ||||
b = base.filectx(f) | ||||
return (not a.cmp(b) | ||||
and a.flags() == b.flags()) | ||||
else: | ||||
return False | ||||
Idan Kamara
|
r16458 | else: | ||
Pierre-Yves David
|
r17472 | return f not in base.manifest() | ||
files = [f for f in files if not samefile(f)] | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | def filectxfn(repo, ctx_, path): | ||
try: | ||||
fctx = ctx[path] | ||||
flags = fctx.flags() | ||||
Sean Farley
|
r21689 | mctx = context.memfilectx(repo, | ||
fctx.path(), fctx.data(), | ||||
Pierre-Yves David
|
r17472 | islink='l' in flags, | ||
isexec='x' in flags, | ||||
copied=copied.get(path)) | ||||
return mctx | ||||
except KeyError: | ||||
Mads Kiilerich
|
r22296 | return None | ||
Pierre-Yves David
|
r17472 | else: | ||
ui.note(_('copying changeset %s to %s\n') % (old, base)) | ||||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | # Use version of files as in the old cset | ||
def filectxfn(repo, ctx_, path): | ||||
try: | ||||
return old.filectx(path) | ||||
except KeyError: | ||||
Mads Kiilerich
|
r22296 | return None | ||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17472 | user = opts.get('user') or old.user() | ||
date = opts.get('date') or old.date() | ||||
FUJIWARA Katsunori
|
r22249 | editform = mergeeditform(old, 'commit.amend') | ||
FUJIWARA Katsunori
|
r22010 | editor = getcommiteditor(editform=editform, **opts) | ||
Pierre-Yves David
|
r17473 | if not message: | ||
FUJIWARA Katsunori
|
r22010 | editor = getcommiteditor(edit=True, editform=editform) | ||
Pierre-Yves David
|
r17473 | message = old.description() | ||
Idan Kamara
|
r16458 | |||
Pierre-Yves David
|
r17811 | pureextra = extra.copy() | ||
extra['amend_source'] = old.hex() | ||||
Pierre-Yves David
|
r17472 | new = context.memctx(repo, | ||
Brodie Rao
|
r18909 | parents=[base.node(), old.p2().node()], | ||
Pierre-Yves David
|
r17472 | text=message, | ||
files=files, | ||||
filectxfn=filectxfn, | ||||
user=user, | ||||
date=date, | ||||
FUJIWARA Katsunori
|
r21240 | extra=extra, | ||
editor=editor) | ||||
Pierre-Yves David
|
r17811 | |||
newdesc = changelog.stripdesc(new.description()) | ||||
if ((not node) | ||||
and newdesc == old.description() | ||||
and user == old.user() | ||||
and date == old.date() | ||||
and pureextra == old.extra()): | ||||
# nothing changed. continuing here would create a new node | ||||
# anyway because of the amend_source noise. | ||||
# | ||||
# This not what we expect from amend. | ||||
return old.node() | ||||
Pierre-Yves David
|
r17472 | ph = repo.ui.config('phases', 'new-commit', phases.draft) | ||
try: | ||||
FUJIWARA Katsunori
|
r20700 | if opts.get('secret'): | ||
commitphase = 'secret' | ||||
else: | ||||
commitphase = old.phase() | ||||
Mads Kiilerich
|
r20790 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') | ||
Pierre-Yves David
|
r17472 | newid = repo.commitctx(new) | ||
finally: | ||||
Mads Kiilerich
|
r20790 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') | ||
Pierre-Yves David
|
r17472 | if newid != old.node(): | ||
# Reroute the working copy parent to the new changeset | ||||
repo.setparents(newid, nullid) | ||||
# Move bookmarks from old parent to amend commit | ||||
bms = repo.nodebookmarks(old.node()) | ||||
if bms: | ||||
Augie Fackler
|
r17922 | marks = repo._bookmarks | ||
Pierre-Yves David
|
r17472 | for bm in bms: | ||
Augie Fackler
|
r17922 | marks[bm] = newid | ||
marks.write() | ||||
Pierre-Yves David
|
r17472 | #commit the whole amend process | ||
Durham Goode
|
r22951 | createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt) | ||
if createmarkers and newid != old.node(): | ||||
Pierre-Yves David
|
r17475 | # mark the new changeset as successor of the rewritten one | ||
new = repo[newid] | ||||
obs = [(old, (new,))] | ||||
if node: | ||||
Pierre-Yves David
|
r17812 | obs.append((ctx, ())) | ||
Pierre-Yves David
|
r17475 | |||
obsolete.createmarkers(repo, obs) | ||||
Pierre-Yves David
|
r17472 | tr.close() | ||
Pierre-Yves David
|
r17461 | finally: | ||
Pierre-Yves David
|
r17472 | tr.release() | ||
Durham Goode
|
r22951 | if not createmarkers and newid != old.node(): | ||
Pierre-Yves David
|
r17475 | # Strip the intermediate commit (if there was one) and the amended | ||
# commit | ||||
Pierre-Yves David
|
r17471 | if node: | ||
ui.note(_('stripping intermediate changeset %s\n') % ctx) | ||||
ui.note(_('stripping amended changeset %s\n') % old) | ||||
repair.strip(ui, repo, old.node(), topic='amend-backup') | ||||
Idan Kamara
|
r16458 | finally: | ||
Pierre-Yves David
|
r18197 | if newid is None: | ||
repo.dirstate.invalidate() | ||||
Mads Kiilerich
|
r19024 | lockmod.release(lock, wlock) | ||
Idan Kamara
|
r16458 | return newid | ||
FUJIWARA Katsunori
|
r21999 | def commiteditor(repo, ctx, subs, editform=''): | ||
Matt Mackall
|
r8407 | if ctx.description(): | ||
return ctx.description() | ||||
FUJIWARA Katsunori
|
r21999 | return commitforceeditor(repo, ctx, subs, editform=editform) | ||
Matt Mackall
|
r8407 | |||
FUJIWARA Katsunori
|
r21999 | def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None, | ||
editform=''): | ||||
Matt Mackall
|
r21923 | if not extramsg: | ||
extramsg = _("Leave message empty to abort commit.") | ||||
FUJIWARA Katsunori
|
r22012 | |||
forms = [e for e in editform.split('.') if e] | ||||
forms.insert(0, 'changeset') | ||||
while forms: | ||||
tmpl = repo.ui.config('committemplate', '.'.join(forms)) | ||||
if tmpl: | ||||
committext = buildcommittemplate(repo, ctx, subs, extramsg, tmpl) | ||||
break | ||||
forms.pop() | ||||
FUJIWARA Katsunori
|
r21924 | else: | ||
committext = buildcommittext(repo, ctx, subs, extramsg) | ||||
FUJIWARA Katsunori
|
r21869 | |||
# run editor in the repository root | ||||
olddir = os.getcwd() | ||||
os.chdir(repo.root) | ||||
FUJIWARA Katsunori
|
r22205 | text = repo.ui.edit(committext, ctx.user(), ctx.extra(), editform=editform) | ||
FUJIWARA Katsunori
|
r21869 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) | ||
os.chdir(olddir) | ||||
if finishdesc: | ||||
text = finishdesc(text) | ||||
if not text.strip(): | ||||
raise util.Abort(_("empty commit message")) | ||||
return text | ||||
FUJIWARA Katsunori
|
r21924 | def buildcommittemplate(repo, ctx, subs, extramsg, tmpl): | ||
ui = repo.ui | ||||
tmpl, mapfile = gettemplate(ui, tmpl, None) | ||||
try: | ||||
t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False) | ||||
except SyntaxError, inst: | ||||
raise util.Abort(inst.args[0]) | ||||
FUJIWARA Katsunori
|
r22013 | for k, v in repo.ui.configitems('committemplate'): | ||
if k != 'changeset': | ||||
t.t.cache[k] = v | ||||
FUJIWARA Katsunori
|
r21924 | if not extramsg: | ||
extramsg = '' # ensure that extramsg is string | ||||
ui.pushbuffer() | ||||
t.show(ctx, extramsg=extramsg) | ||||
return ui.popbuffer() | ||||
FUJIWARA Katsunori
|
r21869 | def buildcommittext(repo, ctx, subs, extramsg): | ||
Matt Mackall
|
r8407 | edittext = [] | ||
Matt Mackall
|
r8707 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() | ||
Matt Mackall
|
r8407 | if ctx.description(): | ||
edittext.append(ctx.description()) | ||||
edittext.append("") | ||||
edittext.append("") # Empty line between message and comments. | ||||
edittext.append(_("HG: Enter commit message." | ||||
" Lines beginning with 'HG:' are removed.")) | ||||
Matt Mackall
|
r21923 | edittext.append("HG: %s" % extramsg) | ||
Matt Mackall
|
r8407 | edittext.append("HG: --") | ||
edittext.append(_("HG: user: %s") % ctx.user()) | ||||
if ctx.p2(): | ||||
edittext.append(_("HG: branch merge")) | ||||
if ctx.branch(): | ||||
Matt Mackall
|
r13047 | edittext.append(_("HG: branch '%s'") % ctx.branch()) | ||
Antonio Zanardo
|
r18538 | if bookmarks.iscurrent(repo): | ||
edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) | ||||
Matt Mackall
|
r8994 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) | ||
Matt Mackall
|
r8407 | edittext.extend([_("HG: added %s") % f for f in added]) | ||
Matt Mackall
|
r8707 | edittext.extend([_("HG: changed %s") % f for f in modified]) | ||
Matt Mackall
|
r8407 | edittext.extend([_("HG: removed %s") % f for f in removed]) | ||
Matt Mackall
|
r8707 | if not added and not modified and not removed: | ||
Matt Mackall
|
r8407 | edittext.append(_("HG: no files changed")) | ||
edittext.append("") | ||||
FUJIWARA Katsunori
|
r21869 | return "\n".join(edittext) | ||
Adrian Buehlmann
|
r14297 | |||
Kevin Bullock
|
r18688 | def commitstatus(repo, node, branch, bheads=None, opts={}): | ||
ctx = repo[node] | ||||
parents = ctx.parents() | ||||
if (not opts.get('amend') and bheads and node not in bheads and not | ||||
[x for x in parents if x.node() in bheads and x.branch() == branch]): | ||||
repo.ui.status(_('created new head\n')) | ||||
# The message is not printed for initial roots. For the other | ||||
# changesets, it is printed in the following situations: | ||||
# | ||||
# Par column: for the 2 parents with ... | ||||
# N: null or no parent | ||||
# B: parent is on another named branch | ||||
# C: parent is a regular non head changeset | ||||
# H: parent was a branch head of the current branch | ||||
# Msg column: whether we print "created new head" message | ||||
# In the following, it is assumed that there already exists some | ||||
# initial branch heads of the current branch, otherwise nothing is | ||||
# printed anyway. | ||||
# | ||||
# Par Msg Comment | ||||
# N N y additional topo root | ||||
# | ||||
# B N y additional branch root | ||||
# C N y additional topo head | ||||
# H N n usual case | ||||
# | ||||
# B B y weird additional branch root | ||||
# C B y branch merge | ||||
# H B n merge with named branch | ||||
# | ||||
# C C y additional head from merge | ||||
# C H n merge with a head | ||||
# | ||||
# H H n head merge: head count decreases | ||||
if not opts.get('close_branch'): | ||||
for r in parents: | ||||
if r.closesbranch() and r.branch() == branch: | ||||
repo.ui.status(_('reopening closed branch head %d\n') % r) | ||||
if repo.ui.debugflag: | ||||
repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) | ||||
elif repo.ui.verbose: | ||||
repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) | ||||
Angel Ezquerra
|
r16304 | def revert(ui, repo, ctx, parents, *pats, **opts): | ||
parent, p2 = parents | ||||
node = ctx.node() | ||||
mf = ctx.manifest() | ||||
Pierre-Yves David
|
r21579 | if node == p2: | ||
parent = p2 | ||||
Angel Ezquerra
|
r16304 | if node == parent: | ||
pmf = mf | ||||
else: | ||||
pmf = None | ||||
# need all matching names in dirstate and manifest of target rev, | ||||
# so have to walk both. do not print errors if files exist in one | ||||
Yuya Nishihara
|
r24451 | # but not other. in both cases, filesets should be evaluated against | ||
# workingctx to get consistent result (issue4497). this means 'set:**' | ||||
# cannot be used to select missing files from target rev. | ||||
Angel Ezquerra
|
r16304 | |||
Pierre-Yves David
|
r21575 | # `names` is a mapping for all elements in working copy and target revision | ||
# The mapping is in the form: | ||||
# <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>) | ||||
Angel Ezquerra
|
r16304 | names = {} | ||
wlock = repo.wlock() | ||||
try: | ||||
Pierre-Yves David
|
r21575 | ## filling of the `names` mapping | ||
# walk dirstate to fill `names` | ||||
Angel Ezquerra
|
r16304 | |||
Laurent Charignon
|
r24475 | interactive = opts.get('interactive', False) | ||
Martin von Zweigbergk
|
r24449 | wctx = repo[None] | ||
m = scmutil.match(wctx, pats, opts) | ||||
Matt Mackall
|
r24479 | |||
# we'll need this later | ||||
targetsubs = sorted(s for s in wctx.substate if m(s)) | ||||
Martin von Zweigbergk
|
r24450 | if not m.always(): | ||
Durham Goode
|
r22573 | m.bad = lambda x, y: False | ||
for abs in repo.walk(m): | ||||
names[abs] = m.rel(abs), m.exact(abs) | ||||
# walk target manifest to fill `names` | ||||
def badfn(path, msg): | ||||
if path in names: | ||||
return | ||||
if path in ctx.substate: | ||||
Angel Ezquerra
|
r16304 | return | ||
Durham Goode
|
r22573 | path_ = path + '/' | ||
for f in names: | ||||
if f.startswith(path_): | ||||
return | ||||
ui.warn("%s: %s\n" % (m.rel(path), msg)) | ||||
m.bad = badfn | ||||
for abs in ctx.walk(m): | ||||
if abs not in names: | ||||
names[abs] = m.rel(abs), m.exact(abs) | ||||
# Find status of all file in `names`. | ||||
m = scmutil.matchfiles(repo, names) | ||||
changes = repo.status(node1=node, match=m, | ||||
unknown=True, ignored=True, clean=True) | ||||
else: | ||||
Martin von Zweigbergk
|
r24450 | changes = repo.status(node1=node, match=m) | ||
Durham Goode
|
r22573 | for kind in changes: | ||
for abs in kind: | ||||
names[abs] = m.rel(abs), m.exact(abs) | ||||
m = scmutil.matchfiles(repo, names) | ||||
Martin von Zweigbergk
|
r23374 | modified = set(changes.modified) | ||
added = set(changes.added) | ||||
removed = set(changes.removed) | ||||
_deleted = set(changes.deleted) | ||||
unknown = set(changes.unknown) | ||||
unknown.update(changes.ignored) | ||||
clean = set(changes.clean) | ||||
Pierre-Yves David
|
r22610 | modadded = set() | ||
Pierre-Yves David
|
r22185 | |||
# split between files known in target manifest and the others | ||||
smf = set(mf) | ||||
# determine the exact nature of the deleted changesets | ||||
Pierre-Yves David
|
r22490 | deladded = _deleted - smf | ||
deleted = _deleted - deladded | ||||
Pierre-Yves David
|
r22155 | |||
Mads Kiilerich
|
r24180 | # We need to account for the state of the file in the dirstate, | ||
# even when we revert against something else than parent. This will | ||||
Pierre-Yves David
|
r22155 | # slightly alter the behavior of revert (doing back up or not, delete | ||
Mads Kiilerich
|
r23139 | # or just forget etc). | ||
Pierre-Yves David
|
r22155 | if parent == node: | ||
dsmodified = modified | ||||
dsadded = added | ||||
dsremoved = removed | ||||
Pierre-Yves David
|
r23403 | # store all local modifications, useful later for rename detection | ||
localchanges = dsmodified | dsadded | ||||
Pierre-Yves David
|
r22155 | modified, added, removed = set(), set(), set() | ||
else: | ||||
changes = repo.status(node1=parent, match=m) | ||||
Martin von Zweigbergk
|
r23374 | dsmodified = set(changes.modified) | ||
dsadded = set(changes.added) | ||||
dsremoved = set(changes.removed) | ||||
Pierre-Yves David
|
r23403 | # store all local modifications, useful later for rename detection | ||
localchanges = dsmodified | dsadded | ||||
Angel Ezquerra
|
r16304 | |||
Pierre-Yves David
|
r22188 | # only take into account for removes between wc and target | ||
clean |= dsremoved - removed | ||||
dsremoved &= removed | ||||
# distinct between dirstate remove and other | ||||
removed -= dsremoved | ||||
Pierre-Yves David
|
r22610 | modadded = added & dsmodified | ||
added -= modadded | ||||
Pierre-Yves David
|
r22190 | # tell newly modified apart. | ||
dsmodified &= modified | ||||
dsmodified |= modified & dsadded # dirstate added may needs backup | ||||
modified -= dsmodified | ||||
Pierre-Yves David
|
r22488 | # We need to wait for some post-processing to update this set | ||
# before making the distinction. The dirstate will be used for | ||||
# that purpose. | ||||
Pierre-Yves David
|
r22208 | dsadded = added | ||
Pierre-Yves David
|
r22209 | # in case of merge, files that are actually added can be reported as | ||
# modified, we need to post process the result | ||||
if p2 != nullid: | ||||
if pmf is None: | ||||
# only need parent manifest in the merge case, | ||||
# so do not read by default | ||||
pmf = repo[parent].manifest() | ||||
mergeadd = dsmodified - set(pmf) | ||||
dsadded |= mergeadd | ||||
dsmodified -= mergeadd | ||||
Angel Ezquerra
|
r16304 | |||
Pierre-Yves David
|
r21575 | # if f is a rename, update `names` to also revert the source | ||
Angel Ezquerra
|
r16304 | cwd = repo.getcwd() | ||
Pierre-Yves David
|
r23403 | for f in localchanges: | ||
Angel Ezquerra
|
r16304 | src = repo.dirstate.copied(f) | ||
Pierre-Yves David
|
r22213 | # XXX should we check for rename down to target node? | ||
Angel Ezquerra
|
r16304 | if src and src not in names and repo.dirstate[src] == 'r': | ||
Pierre-Yves David
|
r22154 | dsremoved.add(src) | ||
Angel Ezquerra
|
r16304 | names[src] = (repo.pathto(src, cwd), True) | ||
Pierre-Yves David
|
r22488 | # distinguish between file to forget and the other | ||
added = set() | ||||
for abs in dsadded: | ||||
if repo.dirstate[abs] != 'a': | ||||
added.add(abs) | ||||
dsadded -= added | ||||
Pierre-Yves David
|
r22490 | for abs in deladded: | ||
Angel Ezquerra
|
r16304 | if repo.dirstate[abs] == 'a': | ||
Pierre-Yves David
|
r22490 | dsadded.add(abs) | ||
deladded -= dsadded | ||||
Pierre-Yves David
|
r22396 | # For files marked as removed, we check if an unknown file is present at | ||
# the same path. If a such file exists it may need to be backed up. | ||||
# Making the distinction at this stage helps have simpler backup | ||||
# logic. | ||||
removunk = set() | ||||
for abs in removed: | ||||
target = repo.wjoin(abs) | ||||
if os.path.lexists(target): | ||||
removunk.add(abs) | ||||
removed -= removunk | ||||
dsremovunk = set() | ||||
for abs in dsremoved: | ||||
target = repo.wjoin(abs) | ||||
if os.path.lexists(target): | ||||
dsremovunk.add(abs) | ||||
dsremoved -= dsremovunk | ||||
Angel Ezquerra
|
r16304 | |||
Pierre-Yves David
|
r21575 | # action to be actually performed by revert | ||
# (<list of file>, message>) tuple | ||||
Pierre-Yves David
|
r21576 | actions = {'revert': ([], _('reverting %s\n')), | ||
'add': ([], _('adding %s\n')), | ||||
Pierre-Yves David
|
r22489 | 'remove': ([], _('removing %s\n')), | ||
Pierre-Yves David
|
r22491 | 'drop': ([], _('removing %s\n')), | ||
Pierre-Yves David
|
r22489 | 'forget': ([], _('forgetting %s\n')), | ||
Pierre-Yves David
|
r22231 | 'undelete': ([], _('undeleting %s\n')), | ||
Pierre-Yves David
|
r22234 | 'noop': (None, _('no changes needed to %s\n')), | ||
Pierre-Yves David
|
r22236 | 'unknown': (None, _('file not managed: %s\n')), | ||
Pierre-Yves David
|
r22231 | } | ||
Angel Ezquerra
|
r16304 | |||
Pierre-Yves David
|
r22608 | # "constant" that convey the backup strategy. | ||
# All set to `discard` if `no-backup` is set do avoid checking | ||||
# no_backup lower in the code. | ||||
Pierre-Yves David
|
r22609 | # These values are ordered for comparison purposes | ||
Pierre-Yves David
|
r22608 | backup = 2 # unconditionally do backup | ||
Pierre-Yves David
|
r22609 | check = 1 # check if the existing file differs from target | ||
Pierre-Yves David
|
r22608 | discard = 0 # never do backup | ||
if opts.get('no_backup'): | ||||
Pierre-Yves David
|
r22609 | backup = check = discard | ||
Angel Ezquerra
|
r16304 | |||
Pierre-Yves David
|
r22611 | backupanddel = actions['remove'] | ||
if not opts.get('no_backup'): | ||||
backupanddel = actions['drop'] | ||||
Angel Ezquerra
|
r16304 | disptable = ( | ||
# dispatch table: | ||||
# file state | ||||
Pierre-Yves David
|
r22153 | # action | ||
# make backup | ||||
Pierre-Yves David
|
r22371 | |||
## Sets that results that will change file on disk | ||||
# Modified compared to target, no local change | ||||
Pierre-Yves David
|
r22372 | (modified, actions['revert'], discard), | ||
Pierre-Yves David
|
r22397 | # Modified compared to target, but local file is deleted | ||
(deleted, actions['revert'], discard), | ||||
Pierre-Yves David
|
r22371 | # Modified compared to target, local change | ||
Pierre-Yves David
|
r22372 | (dsmodified, actions['revert'], backup), | ||
Pierre-Yves David
|
r22371 | # Added since target | ||
Pierre-Yves David
|
r22488 | (added, actions['remove'], discard), | ||
# Added in working directory | ||||
Pierre-Yves David
|
r22489 | (dsadded, actions['forget'], discard), | ||
Pierre-Yves David
|
r22610 | # Added since target, have local modification | ||
Pierre-Yves David
|
r22611 | (modadded, backupanddel, backup), | ||
Pierre-Yves David
|
r22490 | # Added since target but file is missing in working directory | ||
Pierre-Yves David
|
r22491 | (deladded, actions['drop'], discard), | ||
Pierre-Yves David
|
r22371 | # Removed since target, before working copy parent | ||
Pierre-Yves David
|
r22396 | (removed, actions['add'], discard), | ||
# Same as `removed` but an unknown file exists at the same path | ||||
Pierre-Yves David
|
r22609 | (removunk, actions['add'], check), | ||
Pierre-Yves David
|
r22371 | # Removed since targe, marked as such in working copy parent | ||
Pierre-Yves David
|
r22396 | (dsremoved, actions['undelete'], discard), | ||
# Same as `dsremoved` but an unknown file exists at the same path | ||||
Pierre-Yves David
|
r22609 | (dsremovunk, actions['undelete'], check), | ||
Pierre-Yves David
|
r22371 | ## the following sets does not result in any file changes | ||
# File with no modification | ||||
Pierre-Yves David
|
r22372 | (clean, actions['noop'], discard), | ||
Pierre-Yves David
|
r22371 | # Existing file, not tracked anywhere | ||
Pierre-Yves David
|
r22372 | (unknown, actions['unknown'], discard), | ||
Angel Ezquerra
|
r16304 | ) | ||
for abs, (rel, exact) in sorted(names.items()): | ||||
Pierre-Yves David
|
r21575 | # target file to be touch on disk (relative to cwd) | ||
Angel Ezquerra
|
r16304 | target = repo.wjoin(abs) | ||
Pierre-Yves David
|
r21575 | # search the entry in the dispatch table. | ||
Pierre-Yves David
|
r22212 | # if the file is in any of these sets, it was touched in the working | ||
Pierre-Yves David
|
r21575 | # directory parent and we are sure it needs to be reverted. | ||
Pierre-Yves David
|
r22232 | for table, (xlist, msg), dobackup in disptable: | ||
Angel Ezquerra
|
r16304 | if abs not in table: | ||
continue | ||||
Pierre-Yves David
|
r22233 | if xlist is not None: | ||
xlist.append(abs) | ||||
Pierre-Yves David
|
r22609 | if dobackup and (backup <= dobackup | ||
or wctx[abs].cmp(ctx[abs])): | ||||
bakname = "%s.orig" % rel | ||||
ui.note(_('saving current version of %s as %s\n') % | ||||
(rel, bakname)) | ||||
if not opts.get('dry_run'): | ||||
Laurent Charignon
|
r24475 | if interactive: | ||
util.copyfile(target, bakname) | ||||
else: | ||||
util.rename(target, bakname) | ||||
Pierre-Yves David
|
r22233 | if ui.verbose or not exact: | ||
if not isinstance(msg, basestring): | ||||
msg = msg(abs) | ||||
ui.status(msg % rel) | ||||
elif exact: | ||||
Pierre-Yves David
|
r22234 | ui.warn(msg % rel) | ||
Angel Ezquerra
|
r16304 | break | ||
Pierre-Yves David
|
r21575 | |||
Angel Ezquerra
|
r16304 | if not opts.get('dry_run'): | ||
Durham Goode
|
r23965 | needdata = ('revert', 'add', 'undelete') | ||
_revertprefetch(repo, ctx, *[actions[name][0] for name in needdata]) | ||||
Laurent Charignon
|
r24359 | _performrevert(repo, parents, ctx, actions, interactive) | ||
Bryan O'Sullivan
|
r19129 | |||
Matt Harbison
|
r24134 | if targetsubs: | ||
# Revert the subrepos on the revert list | ||||
for sub in targetsubs: | ||||
Matt Harbison
|
r24463 | try: | ||
Matt Harbison
|
r24464 | wctx.sub(sub).revert(ctx.substate[sub], *pats, **opts) | ||
Matt Harbison
|
r24463 | except KeyError: | ||
raise util.Abort("subrepository '%s' does not exist in %s!" | ||||
% (sub, short(ctx.node()))) | ||||
Angel Ezquerra
|
r16304 | finally: | ||
wlock.release() | ||||
Pierre-Yves David
|
r22370 | def _revertprefetch(repo, ctx, *files): | ||
"""Let extension changing the storage layer prefetch content""" | ||||
pass | ||||
Laurent Charignon
|
r24359 | def _performrevert(repo, parents, ctx, actions, interactive=False): | ||
Pierre-Yves David
|
r21576 | """function that actually perform all the actions computed for revert | ||
Pierre-Yves David
|
r20571 | |||
This is an independent function to let extension to plug in and react to | ||||
the imminent revert. | ||||
Mads Kiilerich
|
r21024 | Make sure you have the working directory locked when calling this function. | ||
Pierre-Yves David
|
r20571 | """ | ||
parent, p2 = parents | ||||
node = ctx.node() | ||||
def checkout(f): | ||||
fc = ctx[f] | ||||
FUJIWARA Katsunori
|
r24843 | return repo.wwrite(f, fc.data(), fc.flags()) | ||
Pierre-Yves David
|
r20571 | |||
audit_path = pathutil.pathauditor(repo.root) | ||||
Pierre-Yves David
|
r22489 | for f in actions['forget'][0]: | ||
repo.dirstate.drop(f) | ||||
Pierre-Yves David
|
r21576 | for f in actions['remove'][0]: | ||
Pierre-Yves David
|
r20571 | audit_path(f) | ||
Matt Harbison
|
r24857 | try: | ||
util.unlinkpath(repo.wjoin(f)) | ||||
except OSError: | ||||
pass | ||||
Pierre-Yves David
|
r22491 | repo.dirstate.remove(f) | ||
for f in actions['drop'][0]: | ||||
audit_path(f) | ||||
Pierre-Yves David
|
r20571 | repo.dirstate.remove(f) | ||
normal = None | ||||
if node == parent: | ||||
# We're reverting to our parent. If possible, we'd like status | ||||
# to report the file as clean. We have to use normallookup for | ||||
# merges to avoid losing information about merged/dirty files. | ||||
if p2 != nullid: | ||||
normal = repo.dirstate.normallookup | ||||
else: | ||||
normal = repo.dirstate.normal | ||||
Laurent Charignon
|
r24359 | |||
if interactive: | ||||
# Prompt the user for changes to revert | ||||
torevert = [repo.wjoin(f) for f in actions['revert'][0]] | ||||
m = scmutil.match(ctx, torevert, {}) | ||||
diff = patch.diff(repo, None, ctx.node(), m) | ||||
originalchunks = patch.parsepatch(diff) | ||||
try: | ||||
chunks = recordfilter(repo.ui, originalchunks) | ||||
except patch.PatchError, err: | ||||
raise util.Abort(_('error parsing patch: %s') % err) | ||||
# Apply changes | ||||
fp = cStringIO.StringIO() | ||||
for c in chunks: | ||||
c.write(fp) | ||||
dopatch = fp.tell() | ||||
fp.seek(0) | ||||
if dopatch: | ||||
try: | ||||
patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) | ||||
except patch.PatchError, err: | ||||
raise util.Abort(str(err)) | ||||
del fp | ||||
else: | ||||
for f in actions['revert'][0]: | ||||
FUJIWARA Katsunori
|
r24843 | wsize = checkout(f) | ||
Laurent Charignon
|
r24359 | if normal: | ||
normal(f) | ||||
FUJIWARA Katsunori
|
r24843 | elif wsize == repo.dirstate._map[f][2]: | ||
# changes may be overlooked without normallookup, | ||||
# if size isn't changed at reverting | ||||
repo.dirstate.normallookup(f) | ||||
Pierre-Yves David
|
r20571 | |||
Pierre-Yves David
|
r21576 | for f in actions['add'][0]: | ||
Pierre-Yves David
|
r20571 | checkout(f) | ||
repo.dirstate.add(f) | ||||
normal = repo.dirstate.normallookup | ||||
if node == parent and p2 == nullid: | ||||
normal = repo.dirstate.normal | ||||
Pierre-Yves David
|
r21576 | for f in actions['undelete'][0]: | ||
Pierre-Yves David
|
r20571 | checkout(f) | ||
normal(f) | ||||
copied = copies.pathcopies(repo[parent], ctx) | ||||
Pierre-Yves David
|
r21576 | for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]: | ||
Pierre-Yves David
|
r20571 | if f in copied: | ||
repo.dirstate.copy(copied[f], f) | ||||
Adrian Buehlmann
|
r14297 | def command(table): | ||
Gregory Szorc
|
r21766 | """Returns a function object to be used as a decorator for making commands. | ||
This function receives a command table as its argument. The table should | ||||
be a dict. | ||||
The returned function can be used as a decorator for adding commands | ||||
to that command table. This function accepts multiple arguments to define | ||||
a command. | ||||
The first argument is the command name. | ||||
The options argument is an iterable of tuples defining command arguments. | ||||
See ``mercurial.fancyopts.fancyopts()`` for the format of each tuple. | ||||
Adrian Buehlmann
|
r14297 | |||
Gregory Szorc
|
r21766 | The synopsis argument defines a short, one line summary of how to use the | ||
command. This shows up in the help output. | ||||
Gregory Szorc
|
r21767 | |||
The norepo argument defines whether the command does not require a | ||||
local repository. Most commands operate against a repository, thus the | ||||
default is False. | ||||
Gregory Szorc
|
r21774 | |||
The optionalrepo argument defines whether the command optionally requires | ||||
a local repository. | ||||
Gregory Szorc
|
r21777 | |||
The inferrepo argument defines whether to try to find a repository from the | ||||
command line arguments. If True, arguments will be examined for potential | ||||
repository locations. See ``findrepo()``. If a repository is found, it | ||||
will be used. | ||||
Gregory Szorc
|
r21766 | """ | ||
Gregory Szorc
|
r21777 | def cmd(name, options=(), synopsis=None, norepo=False, optionalrepo=False, | ||
inferrepo=False): | ||||
Adrian Buehlmann
|
r14297 | def decorator(func): | ||
if synopsis: | ||||
Pierre-Yves David
|
r18235 | table[name] = func, list(options), synopsis | ||
Adrian Buehlmann
|
r14297 | else: | ||
Pierre-Yves David
|
r18235 | table[name] = func, list(options) | ||
Gregory Szorc
|
r21767 | |||
if norepo: | ||||
# Avoid import cycle. | ||||
import commands | ||||
commands.norepo += ' %s' % ' '.join(parsealiases(name)) | ||||
Gregory Szorc
|
r21774 | if optionalrepo: | ||
import commands | ||||
commands.optionalrepo += ' %s' % ' '.join(parsealiases(name)) | ||||
Gregory Szorc
|
r21777 | if inferrepo: | ||
import commands | ||||
commands.inferrepo += ' %s' % ' '.join(parsealiases(name)) | ||||
Adrian Buehlmann
|
r14297 | return func | ||
return decorator | ||||
return cmd | ||||
Bryan O'Sullivan
|
r19211 | |||
FUJIWARA Katsunori
|
r21051 | # a list of (ui, repo, otherpeer, opts, missing) functions called by | ||
# commands.outgoing. "missing" is "missing" of the result of | ||||
# "findcommonoutgoing()" | ||||
outgoinghooks = util.hooks() | ||||
Bryan O'Sullivan
|
r19211 | # a list of (ui, repo) functions called by commands.summary | ||
summaryhooks = util.hooks() | ||||
Matt Mackall
|
r19474 | |||
FUJIWARA Katsunori
|
r21047 | # a list of (ui, repo, opts, changes) functions called by commands.summary. | ||
# | ||||
# functions should return tuple of booleans below, if 'changes' is None: | ||||
# (whether-incomings-are-needed, whether-outgoings-are-needed) | ||||
# | ||||
# otherwise, 'changes' is a tuple of tuples below: | ||||
# - (sourceurl, sourcebranch, sourcepeer, incoming) | ||||
# - (desturl, destbranch, destpeer, outgoing) | ||||
summaryremotehooks = util.hooks() | ||||
Matt Mackall
|
r19474 | # A list of state files kept by multistep operations like graft. | ||
# Since graft cannot be aborted, it is considered 'clearable' by update. | ||||
# note: bisect is intentionally excluded | ||||
Matt Mackall
|
r19496 | # (state file, clearable, allowcommit, error, hint) | ||
Matt Mackall
|
r19474 | unfinishedstates = [ | ||
Matt Mackall
|
r19496 | ('graftstate', True, False, _('graft in progress'), | ||
Matt Mackall
|
r19482 | _("use 'hg graft --continue' or 'hg update' to abort")), | ||
Matt Mackall
|
r19496 | ('updatestate', True, False, _('last update was interrupted'), | ||
Matt Mackall
|
r19482 | _("use 'hg update' to get a consistent checkout")) | ||
Matt Mackall
|
r19474 | ] | ||
Matt Mackall
|
r19496 | def checkunfinished(repo, commit=False): | ||
Matt Mackall
|
r19474 | '''Look for an unfinished multistep operation, like graft, and abort | ||
if found. It's probably good to check this right before | ||||
bailifchanged(). | ||||
''' | ||||
Matt Mackall
|
r19496 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | ||
if commit and allowcommit: | ||||
continue | ||||
Matt Mackall
|
r19474 | if repo.vfs.exists(f): | ||
raise util.Abort(msg, hint=hint) | ||||
def clearunfinished(repo): | ||||
'''Check for unfinished operations (as above), and clear the ones | ||||
that are clearable. | ||||
''' | ||||
Matt Mackall
|
r19496 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | ||
Matt Mackall
|
r19474 | if not clearable and repo.vfs.exists(f): | ||
raise util.Abort(msg, hint=hint) | ||||
Matt Mackall
|
r19496 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | ||
Matt Mackall
|
r19474 | if clearable and repo.vfs.exists(f): | ||
util.unlink(repo.join(f)) | ||||