##// END OF EJS Templates
import: import each patch in a file or stream as a separate change...
import: import each patch in a file or stream as a separate change Supports hg export <revrange>, mail messages, and mailboxes. Does not support multiple patches in a single MIME attachment. Closes issue167.

File last commit:

r10344:9501cde4 default
r10384:832f3538 default
Show More
cmdutil.py
1180 lines | 40.4 KiB | text/x-python | PythonLexer
Vadim Gelfer
fix comment.
r2957 # cmdutil.py - help for command processing in mercurial
Vadim Gelfer
refactor text diff/patch code....
r2874 #
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
Vadim Gelfer
refactor text diff/patch code....
r2874 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Vadim Gelfer
refactor text diff/patch code....
r2874
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from node import hex, nullid, nullrev, short
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 import os, sys, errno, re, glob, tempfile, time
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053 import mdiff, bdiff, util, templater, patch, error, encoding, templatekw
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 import match as _match
Vadim Gelfer
refactor text diff/patch code....
r2874
Brendan Cully
Move revision parsing into cmdutil.
r3090 revrangesep = ':'
Matt Mackall
findcmd: have dispatch look up strict flag
r7213 def findpossible(cmd, table, strict=False):
Matt Mackall
dispatch: move dispatching code to cmdutil
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
dispatch: move command dispatching into its own module...
r5178 for e in table.keys():
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549 aliases = e.lstrip("^").split("|")
found = None
if cmd in aliases:
found = cmd
Matt Mackall
findcmd: have dispatch look up strict flag
r7213 elif not strict:
Matt Mackall
dispatch: move dispatching code to cmdutil
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
dispatch: move command dispatching into its own module...
r5178 debugchoice[found] = (aliases, table[e])
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549 else:
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 choice[found] = (aliases, table[e])
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549
if not choice and debugchoice:
choice = debugchoice
return choice
Matt Mackall
findcmd: have dispatch look up strict flag
r7213 def findcmd(cmd, table, strict=True):
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549 """Return (aliases, command table entry) for command string."""
Matt Mackall
findcmd: have dispatch look up strict flag
r7213 choice = findpossible(cmd, table, strict)
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549
Christian Ebert
Prefer i in d over d.has_key(i)
r5915 if cmd in choice:
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549 return choice[cmd]
if len(choice) > 1:
clist = choice.keys()
clist.sort()
Matt Mackall
error: move UnknownCommand and AmbiguousCommand
r7643 raise error.AmbiguousCommand(cmd, clist)
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549
if choice:
return choice.values()[0]
Matt Mackall
error: move UnknownCommand and AmbiguousCommand
r7643 raise error.UnknownCommand(cmd)
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549
def bail_if_changed(repo):
Matt Mackall
cmdutil: make bail_if_changed bail on uncommitted merge
r5716 if repo.dirstate.parents()[1] != nullid:
raise util.Abort(_('outstanding uncommitted merge'))
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549 modified, added, removed, deleted = repo.status()[:4]
if modified or added or removed or deleted:
raise util.Abort(_("outstanding uncommitted changes"))
def logmessage(opts):
""" get the log message according to -m and -l option """
Alexander Solovyov
cmdutil.logmessage: options should be optional
r7667 message = opts.get('message')
logfile = opts.get('logfile')
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549
if message and logfile:
raise util.Abort(_('options --message and --logfile are mutually '
'exclusive'))
if not message and logfile:
try:
if logfile == '-':
message = sys.stdin.read()
else:
message = open(logfile).read()
except IOError, inst:
raise util.Abort(_("can't read commit message '%s': %s") %
(logfile, inst.strerror))
return message
Thomas Arendsen Hein
Move finding/checking the log limit to cmdutil
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
many, many trivial check-code fixups
r10282 if limit <= 0:
raise util.Abort(_('limit must be positive'))
Thomas Arendsen Hein
Move finding/checking the log limit to cmdutil
r6190 else:
Nicolas Dumazet
cmdutil: replace sys.maxint with None as default value in loglimit...
r10111 limit = None
Thomas Arendsen Hein
Move finding/checking the log limit to cmdutil
r6190 return limit
Matt Mackall
add cmdutil.remoteui...
r8188 def remoteui(src, opts):
'build a remote ui from ui or repo and opts'
Matt Mackall
ui: replace parentui mechanism with repo.baseui
r8189 if hasattr(src, 'baseui'): # looks like a repository
Matt Mackall
remoteui: properly create dst with copy()
r8798 dst = src.baseui.copy() # drop repo-specific config
Matt Mackall
add cmdutil.remoteui...
r8188 src = src.ui # copy target options from repo
Matt Mackall
ui: replace parentui mechanism with repo.baseui
r8189 else: # assume it's a global ui object
Matt Mackall
remoteui: properly create dst with copy()
r8798 dst = src.copy() # keep all global options
Matt Mackall
add cmdutil.remoteui...
r8188
# copy ssh-specific options
for o in 'ssh', 'remotecmd':
v = opts.get(o) or src.config('ui', o)
if v:
dst.setconfig("ui", o, v)
Dirkjan Ochtman
cmdutil: copy auth section in remoteui...
r10025
Matt Mackall
add cmdutil.remoteui...
r8188 # copy bundle-specific options
r = src.config('bundle', 'mainreporoot')
if r:
dst.setconfig('bundle', 'mainreporoot', r)
Dirkjan Ochtman
cmdutil: copy auth section in remoteui...
r10025 # copy auth section settings
for key, val in src.configitems('auth'):
dst.setconfig('auth', key, val)
Matt Mackall
add cmdutil.remoteui...
r8188 return dst
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549
Thomas Arendsen Hein
Removed unused ui parameter from revpair/revrange and fix its users.
r3707 def revpair(repo, revs):
Brendan Cully
Move revision parsing into cmdutil.
r3090 '''return pair of nodes, given list of revisions. second item can
be None, meaning use working dir.'''
Matt Mackall
simplify revrange and revpair
r3525
def revfix(repo, val, defval):
Alexis S. L. Carvalho
fix hg diff -r ''
r3825 if not val and val != 0 and defval is not None:
Matt Mackall
simplify revrange and revpair
r3525 val = defval
return repo.lookup(val)
Brendan Cully
Move revision parsing into cmdutil.
r3090 if not revs:
return repo.dirstate.parents()[0], None
end = None
if len(revs) == 1:
Matt Mackall
simplify revrange and revpair
r3525 if revrangesep in revs[0]:
start, end = revs[0].split(revrangesep, 1)
Brendan Cully
Move revision parsing into cmdutil.
r3090 start = revfix(repo, start, 0)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 end = revfix(repo, end, len(repo) - 1)
Brendan Cully
Move revision parsing into cmdutil.
r3090 else:
Matt Mackall
simplify revrange and revpair
r3525 start = revfix(repo, revs[0], None)
Brendan Cully
Move revision parsing into cmdutil.
r3090 elif len(revs) == 2:
if revrangesep in revs[0] or revrangesep in revs[1]:
raise util.Abort(_('too many revisions specified'))
start = revfix(repo, revs[0], None)
end = revfix(repo, revs[1], None)
else:
raise util.Abort(_('too many revisions specified'))
Matt Mackall
simplify revrange and revpair
r3525 return start, end
Brendan Cully
Move revision parsing into cmdutil.
r3090
Thomas Arendsen Hein
Removed unused ui parameter from revpair/revrange and fix its users.
r3707 def revrange(repo, revs):
Brendan Cully
Move revision parsing into cmdutil.
r3090 """Yield revision as strings from a list of revision specifications."""
Matt Mackall
simplify revrange and revpair
r3525
def revfix(repo, val, defval):
Alexis S. L. Carvalho
fix hg log -r ''
r3718 if not val and val != 0 and defval is not None:
Matt Mackall
simplify revrange and revpair
r3525 return defval
return repo.changelog.rev(repo.lookup(val))
Martin Geisler
cmdutil: replace pseudo-set by real set
r8368 seen, l = set(), []
Brendan Cully
Move revision parsing into cmdutil.
r3090 for spec in revs:
if revrangesep in spec:
start, end = spec.split(revrangesep, 1)
start = revfix(repo, start, 0)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 end = revfix(repo, end, len(repo) - 1)
Brendan Cully
Move revision parsing into cmdutil.
r3090 step = start > end and -1 or 1
Matt Mackall
many, many trivial check-code fixups
r10282 for rev in xrange(start, end + step, step):
Brendan Cully
Move revision parsing into cmdutil.
r3090 if rev in seen:
continue
Martin Geisler
cmdutil: replace pseudo-set by real set
r8368 seen.add(rev)
Matt Mackall
Make revrange return a list of ints so that callers don't have to convert
r3526 l.append(rev)
Brendan Cully
Move revision parsing into cmdutil.
r3090 else:
rev = revfix(repo, spec, None)
if rev in seen:
continue
Martin Geisler
cmdutil: replace pseudo-set by real set
r8368 seen.add(rev)
Matt Mackall
Make revrange return a list of ints so that callers don't have to convert
r3526 l.append(rev)
return l
Brendan Cully
Move revision parsing into cmdutil.
r3090
Vadim Gelfer
refactor text diff/patch code....
r2874 def make_filename(repo, pat, node,
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),
}
expander = {
'%': lambda: '%',
'b': lambda: os.path.basename(repo.root),
}
try:
if node:
expander.update(node_expander)
Alexis S. L. Carvalho
archive: make the %r escape work.
r4836 if node:
Vadim Gelfer
refactor text diff/patch code....
r2874 expander['r'] = (lambda:
Alexis S. L. Carvalho
archive: make the %r escape work.
r4836 str(repo.changelog.rev(node)).zfill(revwidth or 0))
Vadim Gelfer
refactor text diff/patch code....
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
white space and line break cleanups
r3673 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
Vadim Gelfer
refactor text diff/patch code....
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
Generally replace "file name" with "filename" in help and comments.
r8761 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
Thomas Arendsen Hein
Never apply string formatting to generated errors with util.Abort....
r3072 inst.args[0])
Vadim Gelfer
refactor text diff/patch code....
r2874
def make_file(repo, pat, node=None,
total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
Ronny Pfannschmidt
export: fixed silent output file overwriting...
r7319
writable = 'w' in mode or 'a' in mode
Vadim Gelfer
refactor text diff/patch code....
r2874 if not pat or pat == '-':
Ronny Pfannschmidt
export: fixed silent output file overwriting...
r7319 return writable and sys.stdout or sys.stdin
if hasattr(pat, 'write') and writable:
Vadim Gelfer
refactor text diff/patch code....
r2874 return pat
if hasattr(pat, 'read') and 'r' in mode:
return pat
return open(make_filename(repo, pat, node, total, seqno, revwidth,
pathname),
mode)
Vadim Gelfer
move walk and matchpats from commands to cmdutil.
r2882
Matt Mackall
cmdutils: Take over glob expansion duties from util
r8614 def expandpats(pats):
if not util.expandglobs:
return list(pats)
ret = []
for p in pats:
kind, name = _match._patsplit(p, None)
if kind is None:
Steve Borho
cmdutil: fall back to filename if glob expand has errors...
r9118 try:
globbed = glob.glob(name)
except re.error:
globbed = [name]
Matt Mackall
cmdutils: Take over glob expansion duties from util
r8614 if globbed:
ret.extend(globbed)
continue
ret.append(p)
return ret
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 def match(repo, pats=[], opts={}, globbed=False, default='relpath'):
Matt Mackall
walk: kill util.cmdmatcher and _matcher
r6575 if not globbed and default == 'relpath':
Matt Mackall
cmdutils: Take over glob expansion duties from util
r8614 pats = expandpats(pats or [])
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = _match.match(repo.root, repo.getcwd(), pats,
opts.get('include'), opts.get('exclude'), default)
Matt Mackall
walk: begin refactoring badmatch handling
r6578 def badfn(f, msg):
repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
m.bad = badfn
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 return m
Vadim Gelfer
move walk and matchpats from commands to cmdutil.
r2882
Matt Mackall
match: use helpers for cmdutil
r6597 def matchall(repo):
return _match.always(repo.root, repo.getcwd())
def matchfiles(repo, files):
return _match.exact(repo.root, repo.getcwd(), files)
Vadim Gelfer
move commands.addremove_lock to cmdutil.addremove
r2883
Matt Mackall
addremove: pass unknown and deleted to findrenames directly again
r8989 def findrenames(repo, added, removed, threshold):
Erling Ellingsen
Avoid some false positives for addremove -s...
r4135 '''find renamed files -- yields (before, after, score) tuples'''
Benoit Boissinot
findrenames: first loop over the removed files, it's faster...
r9925 copies = {}
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo['.']
Benoit Boissinot
findrenames: first loop over the removed files, it's faster...
r9925 for r in removed:
if r not in ctx:
continue
fctx = ctx.filectx(r)
Erling Ellingsen
Avoid some false positives for addremove -s...
r4135
Benoit Boissinot
findrenames: refactor the score computation
r9926 def score(text):
if not len(text):
return 0.0
Benoit Boissinot
findrenames: speedup exact match...
r9927 if not fctx.cmp(text):
return 1.0
if threshold == 1.0:
return 0.0
orig = fctx.data()
Erling Ellingsen
Avoid some false positives for addremove -s...
r4135 # bdiff.blocks() returns blocks of matching lines
# count the number of bytes in each
equal = 0
Benoit Boissinot
findrenames: refactor the score computation
r9926 alines = mdiff.splitnewlines(text)
matches = bdiff.blocks(text, orig)
Benoit Boissinot
findrenames: improve coding-style
r9928 for x1, x2, y1, y2 in matches:
Erling Ellingsen
Avoid some false positives for addremove -s...
r4135 for line in alines[x1:x2]:
equal += len(line)
Benoit Boissinot
findrenames: refactor the score computation
r9926 lengths = len(text) + len(orig)
Benoit Boissinot
findrenames: improve coding-style
r9928 return equal * 2.0 / lengths
Benoit Boissinot
findrenames: refactor the score computation
r9926
for a in added:
bestscore = copies.get(a, (None, threshold))[1]
myscore = score(repo.wread(a))
if myscore >= bestscore:
copies[a] = (r, myscore)
Benoit Boissinot
findrenames: improve coding-style
r9928
Benoit Boissinot
findrenames: first loop over the removed files, it's faster...
r9925 for dest, v in copies.iteritems():
source, score = v
yield source, dest, score
Vadim Gelfer
addremove: add -s/--similarity option...
r2958
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
Vadim Gelfer
move commands.addremove_lock to cmdutil.addremove
r2883 if dry_run is None:
dry_run = opts.get('dry_run')
Vadim Gelfer
addremove: add -s/--similarity option...
r2958 if similarity is None:
similarity = float(opts.get('similarity') or 0)
Matt Mackall
addremove: build lists of already added and removed files too (issue1696)
r8990 # we'd use status here, except handling of symlinks and ignore is tricky
added, unknown, deleted, removed = [], [], [], []
Maxim Dounin
addremove: correctly handle intermediate symlinks...
r6651 audit_path = util.path_auditor(repo.root)
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = match(repo, pats, opts)
Matt Mackall
walk: return a single value
r6586 for abs in repo.walk(m):
Alexis S. L. Carvalho
Use absolute paths in addremove....
r4522 target = repo.wjoin(abs)
Maxim Dounin
addremove: correctly handle intermediate symlinks...
r6651 good = True
try:
audit_path(abs)
except:
good = False
Matt Mackall
walk: remove rel and exact returns
r6584 rel = m.rel(abs)
exact = m.exact(abs)
Patrick Mezard
Merge with crew-stable
r6656 if good and abs not in repo.dirstate:
Matt Mackall
addremove: normalize some variable names
r8988 unknown.append(abs)
Vadim Gelfer
move commands.addremove_lock to cmdutil.addremove
r2883 if repo.ui.verbose or not exact:
repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
Matt Mackall
addremove: build lists of already added and removed files too (issue1696)
r8990 elif repo.dirstate[abs] != 'r' and (not good or not util.lexists(target)
Maxim Dounin
Fix file-changed-to-dir and dir-to-file commits (issue660)....
r5487 or (os.path.isdir(target) and not os.path.islink(target))):
Matt Mackall
addremove: normalize some variable names
r8988 deleted.append(abs)
Vadim Gelfer
move commands.addremove_lock to cmdutil.addremove
r2883 if repo.ui.verbose or not exact:
repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
Matt Mackall
addremove: build lists of already added and removed files too (issue1696)
r8990 # for finding renames
elif repo.dirstate[abs] == 'r':
removed.append(abs)
elif repo.dirstate[abs] == 'a':
added.append(abs)
Vadim Gelfer
move commands.addremove_lock to cmdutil.addremove
r2883 if not dry_run:
Matt Mackall
addremove: normalize some variable names
r8988 repo.remove(deleted)
repo.add(unknown)
Vadim Gelfer
addremove: add -s/--similarity option...
r2958 if similarity > 0:
Matt Mackall
addremove: build lists of already added and removed files too (issue1696)
r8990 for old, new, score in findrenames(repo, added + unknown,
removed + deleted, similarity):
Matt Mackall
addremove: drop some silly variable assignments
r8941 if repo.ui.verbose or not m.exact(old) or not m.exact(new):
Vadim Gelfer
addremove: add -s/--similarity option...
r2958 repo.ui.status(_('recording removal of %s as rename to %s '
'(%d%% similar)\n') %
Matt Mackall
addremove: drop some silly variable assignments
r8941 (m.rel(old), m.rel(new), score * 100))
Vadim Gelfer
addremove: add -s/--similarity option...
r2958 if not dry_run:
Matt Mackall
Make repo locks recursive, eliminate all passing of lock/wlock
r4917 repo.copy(old, new)
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
Matt Mackall
copy: handle rename internally...
r5610 def copy(ui, repo, pats, opts, rename=False):
Matt Mackall
move commands.docopy to cmdutil.copy
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
copy: minor cleanups...
r5607 after = opts.get("after")
dryrun = opts.get("dry_run")
Matt Mackall
move commands.docopy to cmdutil.copy
r5589
Matt Mackall
copy: refactor okaytocopy into walkpat...
r5605 def walkpat(pat):
srcs = []
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = match(repo, [pat], opts, globbed=True)
Matt Mackall
walk: return a single value
r6586 for abs in repo.walk(m):
Matt Mackall
copy: refactor okaytocopy into walkpat...
r5605 state = repo.dirstate[abs]
Matt Mackall
walk: remove rel and exact returns
r6584 rel = m.rel(abs)
exact = m.exact(abs)
Matt Mackall
copy: refactor okaytocopy into walkpat...
r5605 if state in '?r':
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
move commands.docopy to cmdutil.copy
r5589
# abssrc: hgsep
# relsrc: ossep
# otarget: ossep
Matt Mackall
copy: refactor okaytocopy into walkpat...
r5605 def copyfile(abssrc, relsrc, otarget, exact):
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 abstarget = util.canonpath(repo.root, cwd, otarget)
reltarget = repo.pathto(abstarget, cwd)
Matt Mackall
copy: minor cleanups...
r5607 target = repo.wjoin(abstarget)
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 src = repo.wjoin(abssrc)
Matt Mackall
copy: simplify inner copy...
r5608 state = repo.dirstate[abstarget]
Matt Mackall
copy: minor cleanups...
r5607
# check for collisions
prevsrc = targets.get(abstarget)
Matt Mackall
move commands.docopy to cmdutil.copy
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
copy: minor cleanups...
r5607
# check for overwrites
Matt Mackall
copy: simplify inner copy...
r5608 exists = os.path.exists(target)
Martin Geisler
remove unnecessary outer parenthesis in if-statements
r8117 if not after and exists or after and state in 'mn':
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 if not opts['force']:
ui.warn(_('%s: not overwriting - file exists\n') %
reltarget)
return
Matt Mackall
copy: minor cleanups...
r5607
if after:
Matt Mackall
copy: simplify inner copy...
r5608 if not exists:
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 return
Matt Mackall
copy: simplify inner copy...
r5608 elif not dryrun:
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 try:
Matt Mackall
copy: simplify inner copy...
r5608 if exists:
os.unlink(target)
targetdir = os.path.dirname(target) or '.'
if not os.path.isdir(targetdir):
os.makedirs(targetdir)
util.copyfile(src, target)
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 except IOError, inst:
if inst.errno == errno.ENOENT:
ui.warn(_('%s: deleted in working copy\n') % relsrc)
else:
ui.warn(_('%s: cannot copy - %s\n') %
(relsrc, inst.strerror))
Matt Mackall
copy: propagate errors properly
r5606 return True # report a failure
Matt Mackall
copy: minor cleanups...
r5607
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 if ui.verbose or not exact:
Martin Geisler
cmdutil: fix untranslatable string in copy
r7894 if rename:
ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
else:
ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
Matt Mackall
copy: simplify inner copy...
r5608
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 targets[abstarget] = abssrc
Matt Mackall
copy: minor cleanups...
r5607
# fix up dirstate
Matt Mackall
copy: refactor okaytocopy into walkpat...
r5605 origsrc = repo.dirstate.copied(abssrc) or abssrc
Matt Mackall
copy: fix copying back with -A (issue836)
r5604 if abstarget == origsrc: # copying back a copy?
Matt Mackall
copy: simplify inner copy...
r5608 if state not in 'mn' and not dryrun:
repo.dirstate.normallookup(abstarget)
Matt Mackall
copy: fix copying back with -A (issue836)
r5604 else:
Matt Mackall
rename: handle renaming to a target marked removed
r7121 if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 if not ui.quiet:
ui.warn(_("%s has not been committed yet, so no copy "
"data will be stored for %s.\n")
% (repo.pathto(origsrc, cwd), reltarget))
Matt Mackall
rename: handle renaming to a target marked removed
r7121 if repo.dirstate[abstarget] in '?r' and not dryrun:
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 repo.add([abstarget])
Matt Mackall
copy: minor cleanups...
r5607 elif not dryrun:
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 repo.copy(origsrc, abstarget)
Matt Mackall
copy: handle rename internally...
r5610
if rename and not dryrun:
Alexis S. L. Carvalho
rename --after: do not unlink source file (issue910)...
r6566 repo.remove([abssrc], not after)
Matt Mackall
move commands.docopy to cmdutil.copy
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):
abspfx = util.canonpath(repo.root, cwd, pat)
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):
Matt Mackall
match: refactor patkind...
r8568 if _match.patkind(pat):
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 # a mercurial pattern
res = lambda p: os.path.join(dest,
os.path.basename(util.localpath(p)))
else:
abspfx = util.canonpath(repo.root, cwd, pat)
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:])
if os.path.exists(t):
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
cmdutils: Take over glob expansion duties from util
r8614 pats = expandpats(pats)
Matt Mackall
move commands.docopy to cmdutil.copy
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
Fix issue995 (copy --after and symlinks pointing to a directory)...
r6258 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 if not destdirexists:
Matt Mackall
match: refactor patkind...
r8568 if len(pats) > 1 or _match.patkind(pats[0]):
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 raise util.Abort(_('with multiple sources, destination must be an '
'existing directory'))
Shun-ichi GOTO
Add endswithsep() and use it instead of using os.sep and os.altsep directly....
r5843 if util.endswithsep(dest):
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 raise util.Abort(_('destination %s is not a directory') % dest)
Matt Mackall
copy: minor cleanups...
r5607
tfn = targetpathfn
if after:
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 tfn = targetpathafterfn
copylist = []
for pat in pats:
Matt Mackall
copy: refactor okaytocopy into walkpat...
r5605 srcs = walkpat(pat)
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 if not srcs:
continue
copylist.append((tfn(pat, dest, srcs), srcs))
if not copylist:
raise util.Abort(_('no files to copy'))
Matt Mackall
copy: propagate errors properly
r5606 errors = 0
Matt Mackall
move commands.docopy to cmdutil.copy
r5589 for targetpath, srcs in copylist:
Matt Mackall
copy: refactor okaytocopy into walkpat...
r5605 for abssrc, relsrc, exact in srcs:
Matt Mackall
copy: propagate errors properly
r5606 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
errors += 1
Matt Mackall
move commands.docopy to cmdutil.copy
r5589
if errors:
ui.warn(_('(consider using --after)\n'))
Matt Mackall
copy: move rename logic
r5609
Matt Mackall
copy: handle rename internally...
r5610 return errors
Matt Mackall
move commands.docopy to cmdutil.copy
r5589
Nicolas Dumazet
cmdutil: service: add an optional runargs argument to pass the command to run...
r9513 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
Nicolas Dumazet
cmdutil: service: add appendpid parameter to append pids to pid file
r10012 runargs=None, appendpid=False):
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380 '''Run a command as a service.'''
if opts['daemon'] and not opts['daemon_pipefds']:
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 # Signal child process startup with file removal
lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
Matt Mackall
many, many trivial check-code fixups
r10282 os.close(lockfd)
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 try:
if not runargs:
Patrick Mezard
Find right hg command for detached process...
r10239 runargs = util.hgcmd() + sys.argv[1:]
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 runargs.append('--daemon-pipefds=%s' % lockpath)
# Don't pass --cwd to the child process, because we've already
# changed directory.
Matt Mackall
many, many trivial check-code fixups
r10282 for i in xrange(1, len(runargs)):
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 if runargs[i].startswith('--cwd='):
del runargs[i]
break
elif runargs[i].startswith('--cwd'):
Matt Mackall
many, many trivial check-code fixups
r10282 del runargs[i:i + 2]
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 break
Patrick Mezard
util: make spawndetached() handle subprocess early terminations...
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'))
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 finally:
try:
os.unlink(lockpath)
except OSError, e:
if e.errno != errno.ENOENT:
raise
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380 if parentfn:
return parentfn(pid)
else:
Nicolas Dumazet
cmdutil.service: do not _exit(0) in the parent process...
r9896 return
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380
if initfn:
initfn()
if opts['pid_file']:
Nicolas Dumazet
cmdutil: service: add appendpid parameter to append pids to pid file
r10012 mode = appendpid and 'a' or 'w'
fp = open(opts['pid_file'], mode)
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380 fp.write(str(os.getpid()) + '\n')
fp.close()
if opts['daemon_pipefds']:
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 lockpath = opts['daemon_pipefds']
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380 try:
os.setsid()
except AttributeError:
pass
Patrick Mezard
cmdutil: replace unix pipe handshake with file lock...
r10238 os.unlink(lockpath)
Patrick Mezard
cmdutil: hide child window created by win32 spawndetached()...
r10240 util.hidewindow()
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380 sys.stdout.flush()
sys.stderr.flush()
Nicolas Dumazet
cmdutil: service: logfile option to redirect stdout & stderr in a file
r8789
nullfd = os.open(util.nulldev, os.O_RDWR)
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
Refactor commands.serve to allow other commands to run as services....
r4380
if runfn:
return runfn()
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 class changeset_printer(object):
'''show changeset information when templating not requested.'''
Jim Correia
add --git option to commands supporting --patch (log, incoming, history, tip)...
r7762 def __init__(self, ui, repo, patch, diffopts, buffered):
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 self.ui = ui
self.repo = repo
Matt Mackall
Refactor log ui buffering and patch display
r3645 self.buffered = buffered
self.patch = patch
Jim Correia
add --git option to commands supporting --patch (log, incoming, history, tip)...
r7762 self.diffopts = diffopts
Matt Mackall
use ui buffering in changeset printer...
r3738 self.header = {}
self.hunk = {}
self.lastheader = None
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 self.footer = None
Matt Mackall
Refactor log ui buffering and patch display
r3645
def flush(self, rev):
Matt Mackall
use ui buffering in changeset printer...
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
templates: move changeset templating bits to cmdutils
r3643
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 def close(self):
if self.footer:
self.ui.write(self.footer)
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 def show(self, ctx, copies=None, **props):
Matt Mackall
use ui buffering in changeset printer...
r3738 if self.buffered:
self.ui.pushbuffer()
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 self._show(ctx, copies, props)
self.hunk[ctx.rev()] = self.ui.popbuffer()
Matt Mackall
use ui buffering in changeset printer...
r3738 else:
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 self._show(ctx, copies, props)
Matt Mackall
use ui buffering in changeset printer...
r3738
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 def _show(self, ctx, copies, props):
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 '''show a single changeset or file revision'''
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 changenode = ctx.node()
rev = ctx.rev()
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
if self.ui.quiet:
self.ui.write("%d:%s\n" % (rev, short(changenode)))
return
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 log = self.repo.changelog
Greg Ward
cmdutil: changeset_printer: use methods of filectx/changectx....
r9547 date = util.datestr(ctx.date())
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
hexfunc = self.ui.debugflag and hex or short
Thomas Arendsen Hein
hg log: Move filtering implicit parents to own method and use it in templater....
r4825 parents = [(p, hexfunc(log.node(p)))
for p in self._meaningful_parentrevs(log, rev)]
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
Adrian Buehlmann
cmdutil: minor refactoring of changeset_printer._show...
r9637 branch = ctx.branch()
Alexis S. L. Carvalho
"default" is the default branch name
r4176 # don't show the default branch name
if branch != 'default':
Matt Mackall
move encoding bits from util to encoding...
r7948 branch = encoding.tolocal(branch)
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 self.ui.write(_("branch: %s\n") % branch)
for tag in self.repo.nodetags(changenode):
self.ui.write(_("tag: %s\n") % tag)
for parent in parents:
self.ui.write(_("parent: %d:%s\n") % parent)
if self.ui.debugflag:
Greg Ward
cmdutil: changeset_printer: use methods of filectx/changectx....
r9547 mnode = ctx.manifestnode()
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 self.ui.write(_("manifest: %d:%s\n") %
Greg Ward
cmdutil: changeset_printer: use methods of filectx/changectx....
r9547 (self.repo.manifest.rev(mnode), hex(mnode)))
self.ui.write(_("user: %s\n") % ctx.user())
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 self.ui.write(_("date: %s\n") % date)
if self.ui.debugflag:
files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
for key, value in zip([_("files:"), _("files+:"), _("files-:")],
files):
if value:
self.ui.write("%-12s %s\n" % (key, " ".join(value)))
Greg Ward
cmdutil: changeset_printer: use methods of filectx/changectx....
r9547 elif ctx.files() and self.ui.verbose:
self.ui.write(_("files: %s\n") % " ".join(ctx.files()))
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 if copies and self.ui.verbose:
copies = ['%s (%s)' % c for c in copies]
self.ui.write(_("copies: %s\n") % ' '.join(copies))
Adrian Buehlmann
cmdutil: minor refactoring of changeset_printer._show...
r9637 extra = ctx.extra()
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 if extra and self.ui.debugflag:
Matt Mackall
replace util.sort with sorted built-in...
r8209 for key, value in sorted(extra.items()):
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 self.ui.write(_("extra: %s=%s\n")
% (key, value.encode('string_escape')))
Greg Ward
cmdutil: changeset_printer: use methods of filectx/changectx....
r9547 description = ctx.description().strip()
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 if description:
if self.ui.verbose:
self.ui.write(_("description:\n"))
self.ui.write(description)
self.ui.write("\n\n")
else:
self.ui.write(_("summary: %s\n") %
description.splitlines()[0])
self.ui.write("\n")
Matt Mackall
Refactor log ui buffering and patch display
r3645 self.showpatch(changenode)
def showpatch(self, node):
if self.patch:
prev = self.repo.changelog.parents(node)[0]
Dirkjan Ochtman
patch: turn patch.diff() into a generator...
r7308 chunks = patch.diff(self.repo, prev, node, match=self.patch,
Jim Correia
add --git option to commands supporting --patch (log, incoming, history, tip)...
r7762 opts=patch.diffopts(self.ui, self.diffopts))
Dirkjan Ochtman
patch: turn patch.diff() into a generator...
r7308 for chunk in chunks:
self.ui.write(chunk)
Matt Mackall
Refactor log ui buffering and patch display
r3645 self.ui.write("\n")
Thomas Arendsen Hein
hg log: Move filtering implicit parents to own method and use it in templater....
r4825 def _meaningful_parentrevs(self, log, rev):
"""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.
"""
parents = log.parentrevs(rev)
if not self.ui.debugflag and parents[1] == nullrev:
if parents[0] >= rev - 1:
parents = []
else:
parents = [parents[0]]
return parents
Matt Mackall
Refactor log ui buffering and patch display
r3645 class changeset_templater(changeset_printer):
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 '''format changeset information.'''
Jim Correia
add --git option to commands supporting --patch (log, incoming, history, tip)...
r7762 def __init__(self, ui, repo, patch, diffopts, mapfile, buffered):
changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
Dirkjan Ochtman
templater: provide the standard template filters by default
r8360 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
Patrick Mezard
Make {file_copies} usable as a --template key...
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
templater: provide the standard template filters by default
r8360 self.t = templater.templater(mapfile, {'formatnode': formatnode},
Patrick Mezard
Make {file_copies} usable as a --template key...
r10061 cache=defaulttempl)
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 self.cache = {}
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
def use_template(self, t):
'''set template string to use'''
self.t.cache['changeset'] = t
Alexander Solovyov
templater: use contexts consistently throughout changeset_templater
r7878 def _meaningful_parentrevs(self, ctx):
"""Return list of meaningful (or all if debug) parentrevs for rev.
"""
parents = ctx.parents()
if len(parents) > 1:
return parents
if self.ui.debugflag:
return [parents[0], self.repo['null']]
if parents[0].rev() >= ctx.rev() - 1:
return []
return parents
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 def _show(self, ctx, copies, props):
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 '''show a single changeset or file revision'''
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053 showlist = templatekw.showlist
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
Patrick Mezard
cmdutil: extract file copies closure into templatekw
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
templates: move changeset templating bits to cmdutils
r3643 def showparents(**args):
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 ctx = args['ctx']
Alexander Solovyov
templater: use contexts consistently throughout changeset_templater
r7878 parents = [[('rev', p.rev()), ('node', p.hex())]
for p in self._meaningful_parentrevs(ctx)]
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 return showlist('parent', parents, **args)
props = props.copy()
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 props.update(templatekw.keywords)
Patrick Mezard
cmdutil: extract file copies closure into templatekw
r10058 props['parents'] = showparents
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053 props['templ'] = self.t
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 props['ctx'] = ctx
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 props['repo'] = self.repo
Patrick Mezard
cmdutil: extract file copies closure into templatekw
r10058 props['revcache'] = {'copies': copies}
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 props['cache'] = self.cache
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
Dirkjan Ochtman
cmdutil: prevent code repetition by abstraction in changeset_templater
r8013 # find correct templates for current mode
tmplmodes = [
(True, None),
(self.ui.verbose, 'verbose'),
(self.ui.quiet, 'quiet'),
(self.ui.debugflag, 'debug'),
]
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 types = {'header': '', 'footer':'', 'changeset': 'changeset'}
Dirkjan Ochtman
cmdutil: prevent code repetition by abstraction in changeset_templater
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
templates: move changeset templating bits to cmdutils
r3643 try:
Dirkjan Ochtman
cmdutil: prevent code repetition by abstraction in changeset_templater
r8013
# write header
if types['header']:
h = templater.stringify(self.t(types['header'], **props))
Matt Mackall
Refactor log ui buffering and patch display
r3645 if self.buffered:
Alexander Solovyov
templater: use contexts consistently throughout changeset_templater
r7878 self.header[ctx.rev()] = h
Matt Mackall
Refactor log ui buffering and patch display
r3645 else:
self.ui.write(h)
Dirkjan Ochtman
cmdutil: prevent code repetition by abstraction in changeset_templater
r8013
# write changeset metadata, then patch if requested
key = types['changeset']
Matt Mackall
Refactor log ui buffering and patch display
r3645 self.ui.write(templater.stringify(self.t(key, **props)))
Alexander Solovyov
templater: use contexts consistently throughout changeset_templater
r7878 self.showpatch(ctx.node())
Dirkjan Ochtman
cmdutil: prevent code repetition by abstraction in changeset_templater
r8013
Robert Bachmann
Bugfix and test for hg log XML output
r10160 if types['footer']:
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 if not self.footer:
self.footer = templater.stringify(self.t(types['footer'],
**props))
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 except KeyError, inst:
Dirkjan Ochtman
cmdutil: prevent code repetition by abstraction in changeset_templater
r8013 msg = _("%s: no key named '%s'")
raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 except SyntaxError, inst:
raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
Matt Mackall
Fix log regression where log -p file showed diffs for other files
r3837 def show_changeset(ui, repo, opts, buffered=False, matchfn=False):
Matt Mackall
templates: move changeset templating bits to cmdutils
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
Matt Mackall
Fix log regression where log -p file showed diffs for other files
r3837 patch = False
if opts.get('patch'):
Matt Mackall
match: use helpers for cmdutil
r6597 patch = matchfn or matchall(repo)
Matt Mackall
Fix log regression where log -p file showed diffs for other files
r3837
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 tmpl = opts.get('template')
Dirkjan Ochtman
cmdutil: refactor handling of templating in show_changeset()
r7967 style = None
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 if tmpl:
tmpl = templater.parsestring(tmpl, quoted=False)
else:
Dirkjan Ochtman
cmdutil: refactor handling of templating in show_changeset()
r7967 style = opts.get('style')
# ui settings
if not (tmpl or style):
tmpl = ui.config('ui', 'logtemplate')
if tmpl:
tmpl = templater.parsestring(tmpl)
else:
Patrick Mezard
cmdutil: expand style paths (issue1948)...
r10249 style = util.expandpath(ui.config('ui', 'style', ''))
Dirkjan Ochtman
cmdutil: refactor handling of templating in show_changeset()
r7967
if not (tmpl or style):
return changeset_printer(ui, repo, patch, opts, buffered)
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
Dirkjan Ochtman
cmdutil: refactor handling of templating in show_changeset()
r7967 mapfile = None
if style and not tmpl:
mapfile = style
if not os.path.split(mapfile)[0]:
mapname = (templater.templatepath('map-cmdline.' + mapfile)
or templater.templatepath(mapfile))
Matt Mackall
many, many trivial check-code fixups
r10282 if mapname:
mapfile = mapname
Dirkjan Ochtman
cmdutil: refactor handling of templating in show_changeset()
r7967
try:
t = changeset_templater(ui, repo, patch, opts, mapfile, buffered)
except SyntaxError, inst:
raise util.Abort(inst.args[0])
Matt Mackall
many, many trivial check-code fixups
r10282 if tmpl:
t.use_template(tmpl)
Dirkjan Ochtman
cmdutil: refactor handling of templating in show_changeset()
r7967 return t
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643
Matt Mackall
Add --date support to update and revert...
r3814 def finddate(ui, repo, date):
"""Find the tipmost changeset that matches the given date spec"""
Dirkjan Ochtman
merge changes from mpm
r9667
mark.williamson@cl.cam.ac.uk
Tweak finddate to pass date directly....
r5836 df = util.matchdate(date)
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 m = matchall(repo)
Matt Mackall
Add --date support to update and revert...
r3814 results = {}
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662
def prep(ctx, fns):
d = ctx.date()
if df(d[0]):
Dirkjan Ochtman
cmdutil: fix bug in finddate() implementation
r9668 results[ctx.rev()] = d
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662
Dirkjan Ochtman
merge changes from mpm
r9667 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 rev = ctx.rev()
if rev in results:
ui.status(_("Found revision %s from %s\n") %
(rev, util.datestr(results[rev])))
return str(rev)
Matt Mackall
Add --date support to update and revert...
r3814
raise util.Abort(_("revision matching date not found"))
Matt Mackall
walkchangerevs: drop ui arg
r9665 def walkchangerevs(repo, match, opts, prepare):
timeless
help: miscellaneous language fixes
r7807 '''Iterate over files and the revs in which they changed.
Matt Mackall
move walkchangerevs to cmdutils
r3650
Callers most commonly need to iterate backwards over the history
timeless
help: miscellaneous language fixes
r7807 in which they are interested. Doing so has awful (quadratic-looking)
Matt Mackall
move walkchangerevs to cmdutils
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
walkchangerevs: move 'add' to callback...
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
move walkchangerevs to cmdutils
r3650
def increasing_windows(start, end, windowsize=8, sizelimit=512):
if start < end:
while start < end:
Matt Mackall
many, many trivial check-code fixups
r10282 yield start, min(windowsize, end - start)
Matt Mackall
move walkchangerevs to cmdutils
r3650 start += windowsize
if windowsize < sizelimit:
windowsize *= 2
else:
while start > end:
Matt Mackall
many, many trivial check-code fixups
r10282 yield start, min(windowsize, start - end - 1)
Matt Mackall
move walkchangerevs to cmdutils
r3650 start -= windowsize
if windowsize < sizelimit:
windowsize *= 2
follow = opts.get('follow') or opts.get('follow_first')
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 if not len(repo):
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 return []
Matt Mackall
move walkchangerevs to cmdutils
r3650
if follow:
Matt Mackall
use repo[changeid] to get a changectx
r6747 defrange = '%s:0' % repo['.'].rev()
Matt Mackall
move walkchangerevs to cmdutils
r3650 else:
Alexis S. L. Carvalho
cmdutil.walkchangerevs: use '-1:0' instead ot 'tip:0'...
r6145 defrange = '-1:0'
Thomas Arendsen Hein
Removed unused ui parameter from revpair/revrange and fix its users.
r3707 revs = revrange(repo, opts['rev'] or [defrange])
Martin Geisler
replace set-like dictionaries with real sets...
r8152 wanted = set()
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 slowpath = match.anypats() or (match.files() and opts.get('removed'))
Matt Mackall
move walkchangerevs to cmdutils
r3650 fncache = {}
Matt Mackall
walkchangerevs: internalize ctx caching
r9655 change = util.cachefunc(repo.changectx)
Matt Mackall
move walkchangerevs to cmdutils
r3650
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 if not slowpath and not match.files():
Matt Mackall
move walkchangerevs to cmdutils
r3650 # No files, no patterns. Display all revs.
Martin Geisler
replace set-like dictionaries with real sets...
r8152 wanted = set(revs)
Matt Mackall
move walkchangerevs to cmdutils
r3650 copies = []
Matt Mackall
walkchangerevs: drop ui arg
r9665
Matt Mackall
move walkchangerevs to cmdutils
r3650 if not slowpath:
# Only files, no patterns. Check the history of each file.
def filerevgen(filelog, node):
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 cl_count = len(repo)
Matt Mackall
move walkchangerevs to cmdutils
r3650 if node is None:
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 last = len(filelog) - 1
Matt Mackall
move walkchangerevs to cmdutils
r3650 else:
last = filelog.rev(node)
for i, window in increasing_windows(last, nullrev):
revs = []
for j in xrange(i - window, i + 1):
n = filelog.node(j)
Matt Mackall
linkrev: take a revision number rather than a hash
r7361 revs.append((filelog.linkrev(j),
Matt Mackall
move walkchangerevs to cmdutils
r3650 follow and filelog.renamed(n)))
Matt Mackall
replace various uses of list.reverse()
r8210 for rev in reversed(revs):
Matt Mackall
move walkchangerevs to cmdutils
r3650 # only yield rev for which we have the changelog, it can
# happen while doing "hg log" during a pull or commit
if rev[0] < cl_count:
yield rev
def iterfiles():
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 for filename in match.files():
Matt Mackall
move walkchangerevs to cmdutils
r3650 yield filename, None
for filename_node in copies:
yield filename_node
minrev, maxrev = min(revs), max(revs)
for file_, node in iterfiles():
filelog = repo.file(file_)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 if not len(filelog):
Patrick Mezard
cmdutil: handle and warn about missing copy revisions
r6536 if node is None:
# A zero count may be a directory or deleted file, so
# try to find matching entries on the slow path.
Brendan Cully
Improved error message for log --follow...
r7404 if follow:
Matt Mackall
many, many trivial check-code fixups
r10282 raise util.Abort(
_('cannot follow nonexistent file: "%s"') % file_)
Patrick Mezard
cmdutil: handle and warn about missing copy revisions
r6536 slowpath = True
break
else:
continue
Matt Mackall
move walkchangerevs to cmdutils
r3650 for rev, copied in filerevgen(filelog, node):
if rev <= maxrev:
if rev < minrev:
break
fncache.setdefault(rev, [])
fncache[rev].append(file_)
Martin Geisler
replace set-like dictionaries with real sets...
r8152 wanted.add(rev)
Matt Mackall
move walkchangerevs to cmdutils
r3650 if follow and copied:
copies.append(copied)
if slowpath:
if follow:
raise util.Abort(_('can only follow copies/renames for explicit '
timeless
Generally replace "file name" with "filename" in help and comments.
r8761 'filenames'))
Matt Mackall
move walkchangerevs to cmdutils
r3650
# The slow path checks files modified in every changeset.
def changerevgen():
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 for i, window in increasing_windows(len(repo) - 1, nullrev):
Matt Mackall
move walkchangerevs to cmdutils
r3650 for j in xrange(i - window, i + 1):
Dirkjan Ochtman
cmdutil: use context objects for walkchangerevs()
r9367 yield change(j)
Matt Mackall
move walkchangerevs to cmdutils
r3650
Dirkjan Ochtman
cmdutil: use context objects for walkchangerevs()
r9367 for ctx in changerevgen():
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 matches = filter(match, ctx.files())
Matt Mackall
move walkchangerevs to cmdutils
r3650 if matches:
Dirkjan Ochtman
cmdutil: use context objects for walkchangerevs()
r9367 fncache[ctx.rev()] = matches
wanted.add(ctx.rev())
Matt Mackall
move walkchangerevs to cmdutils
r3650
Benoit Boissinot
use new style classes
r8778 class followfilter(object):
Matt Mackall
move walkchangerevs to cmdutils
r3650 def __init__(self, onlyfirst=False):
self.startrev = nullrev
Benoit Boissinot
log --follow: use a set instead of a list...
r10024 self.roots = set()
Matt Mackall
move walkchangerevs to cmdutils
r3650 self.onlyfirst = onlyfirst
def match(self, rev):
def realparents(rev):
if self.onlyfirst:
return repo.changelog.parentrevs(rev)[0:1]
else:
return filter(lambda x: x != nullrev,
repo.changelog.parentrevs(rev))
if self.startrev == nullrev:
self.startrev = rev
return True
if rev > self.startrev:
# forward: all descendants
if not self.roots:
Benoit Boissinot
log --follow: use a set instead of a list...
r10024 self.roots.add(self.startrev)
Matt Mackall
move walkchangerevs to cmdutils
r3650 for parent in realparents(rev):
if parent in self.roots:
Benoit Boissinot
log --follow: use a set instead of a list...
r10024 self.roots.add(rev)
Matt Mackall
move walkchangerevs to cmdutils
r3650 return True
else:
# backwards: all parents
if not self.roots:
Benoit Boissinot
log --follow: use a set instead of a list...
r10024 self.roots.update(realparents(self.startrev))
Matt Mackall
move walkchangerevs to cmdutils
r3650 if rev in self.roots:
self.roots.remove(rev)
Benoit Boissinot
log --follow: use a set instead of a list...
r10024 self.roots.update(realparents(rev))
Matt Mackall
move walkchangerevs to cmdutils
r3650 return True
return False
# 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', ()):
rev = repo.changelog.rev(repo.lookup(rev))
ff = followfilter()
stop = min(revs[0], revs[-1])
Matt Mackall
many, many trivial check-code fixups
r10282 for x in xrange(rev, stop - 1, -1):
Martin Geisler
replace set-like dictionaries with real sets...
r8152 if ff.match(x):
wanted.discard(x)
Matt Mackall
move walkchangerevs to cmdutils
r3650
def iterate():
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 if follow and not match.files():
Matt Mackall
move walkchangerevs to cmdutils
r3650 ff = followfilter(onlyfirst=opts.get('follow_first'))
def want(rev):
Martin Geisler
cmdutil: return boolean result directly in want function
r8119 return ff.match(rev) and rev in wanted
Matt Mackall
move walkchangerevs to cmdutils
r3650 else:
def want(rev):
return rev in wanted
for i, window in increasing_windows(0, len(revs)):
Matt Mackall
walkchangerevs: reset cache between windows
r9664 change = util.cachefunc(repo.changectx)
Matt Mackall
many, many trivial check-code fixups
r10282 nrevs = [rev for rev in revs[i:i + window] if want(rev)]
Matt Mackall
replace util.sort with sorted built-in...
r8209 for rev in sorted(nrevs):
Matt Mackall
move walkchangerevs to cmdutils
r3650 fns = fncache.get(rev)
Matt Mackall
walkchangerevs: yield contexts
r9654 ctx = change(rev)
Matt Mackall
move walkchangerevs to cmdutils
r3650 if not fns:
def fns_generator():
Matt Mackall
walkchangerevs: yield contexts
r9654 for f in ctx.files():
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 if match(f):
Matt Mackall
move walkchangerevs to cmdutils
r3650 yield f
fns = fns_generator()
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 prepare(ctx, fns)
Matt Mackall
move walkchangerevs to cmdutils
r3650 for rev in nrevs:
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 yield change(rev)
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 return iterate()
Bryan O'Sullivan
commands: move commit to cmdutil as wrapper for commit-like functions
r5034
def commit(ui, repo, commitfunc, pats, opts):
'''commit the specified files or all outstanding changes'''
Thomas Arendsen Hein
Fix bad behaviour when specifying an invalid date (issue700)...
r6139 date = opts.get('date')
if date:
opts['date'] = util.parsedate(date)
Bryan O'Sullivan
commands: move commit to cmdutil as wrapper for commit-like functions
r5034 message = logmessage(opts)
Kirill Smelkov
cmdutil.commit: extract 'addremove' from opts carefully...
r5829 # extract addremove carefully -- this function can be called from a command
# that doesn't support addremove
if opts.get('addremove'):
Bryan O'Sullivan
commands: move commit to cmdutil as wrapper for commit-like functions
r5034 addremove(repo, pats, opts)
Kirill Smelkov
cmdutil.commit: extract 'addremove' from opts carefully...
r5829
Matt Mackall
commit: move explicit file checking into repo.commit
r8709 return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407
Matt Mackall
commit: report modified subrepos in commit editor
r8994 def commiteditor(repo, ctx, subs):
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 if ctx.description():
return ctx.description()
Matt Mackall
commit: report modified subrepos in commit editor
r8994 return commitforceeditor(repo, ctx, subs)
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407
Matt Mackall
commit: report modified subrepos in commit editor
r8994 def commitforceeditor(repo, ctx, subs):
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 edittext = []
Matt Mackall
commit: editor reads file lists from provided context
r8707 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
Matt Mackall
commit: move commit editor to cmdutil, pass as function
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."))
Martin Geisler
cmdutil: mark string for translation
r8535 edittext.append(_("HG: Leave message empty to abort commit."))
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 edittext.append("HG: --")
edittext.append(_("HG: user: %s") % ctx.user())
if ctx.p2():
edittext.append(_("HG: branch merge"))
if ctx.branch():
edittext.append(_("HG: branch '%s'")
% encoding.tolocal(ctx.branch()))
Matt Mackall
commit: report modified subrepos in commit editor
r8994 edittext.extend([_("HG: subrepo %s") % s for s in subs])
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 edittext.extend([_("HG: added %s") % f for f in added])
Matt Mackall
commit: editor reads file lists from provided context
r8707 edittext.extend([_("HG: changed %s") % f for f in modified])
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 edittext.extend([_("HG: removed %s") % f for f in removed])
Matt Mackall
commit: editor reads file lists from provided context
r8707 if not added and not modified and not removed:
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 edittext.append(_("HG: no files changed"))
edittext.append("")
# run editor in the repository root
olddir = os.getcwd()
os.chdir(repo.root)
text = repo.ui.edit("\n".join(edittext), ctx.user())
Matt Mackall
editor: move HG: filtering from ui to commiteditor
r8409 text = re.sub("(?m)^HG:.*\n", "", text)
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 os.chdir(olddir)
if not text.strip():
raise util.Abort(_("empty commit message"))
return text