mercurial-scm/hg: mercurial/cmdutil.py annotate

annotate mercurial/cmdutil.py @ 26547:b9be8ab6e628

patch: move 'extract' return to a dictionnary The final goal here is to be able to parse, return and process arbitrary data from patch. This mirror the recently added ability to add arbitrary data to patch headers. The first step is to return something more flexible, so we return a dict without changing any other logic.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Tue, 06 Oct 2015 02:01:53 -0700
parents	e99c3846d78a
children	1f14920a892c

rev	line source
2957 6e062d9b188f fix comment. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2885 diff changeset	1 # cmdutil.py - help for command processing in mercurial
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10249 diff changeset	6 # GNU General Public License version 2 or any later version.
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	7
25762 f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25759 diff changeset	8 from node import hex, bin, nullid, nullrev, short
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	10 import os, sys, errno, re, tempfile, cStringIO, shutil
15214 231aac5280ba rebase: move updatedirstate into cmdutil so it can be shared Matt Mackall <mpm@selenic.com> parents: 14986 diff changeset	11 import util, scmutil, templater, patch, error, templatekw, revlog, copies
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	12 import match as matchmod
26531 15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	13 import repair, graphmod, revset, phases, obsolete, pathutil
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	14 import changelog
18538 94317c2d53b8 commit: show active bookmark in commit editor helper text Antonio Zanardo <zanardo@gmail.com> parents: 18364 diff changeset	15 import bookmarks
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	16 import encoding
25511 c2a4dfe2a336 formatter: move most of template option helper to formatter Matt Mackall <mpm@selenic.com> parents: 25439 diff changeset	17 import formatter
24311 e02a0a419418 record: change recording function to work with crecord Laurent Charignon <lcharignon@fb.com> parents: 24309 diff changeset	18 import crecord as crecordmod
17471 ad1561723dde amend: lock the repository during the whole process Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17468 diff changeset	19 import lock as lockmod
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	20
25256 5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	21 def ishunk(x):
5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	22 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	23 return isinstance(x, hunkclasses)
5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	24
25257 07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	25 def newandmodified(chunks, originalchunks):
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	26 newlyaddedandmodifiedfiles = set()
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	27 for chunk in chunks:
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	28 if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	29 originalchunks:
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	30 newlyaddedandmodifiedfiles.add(chunk.header.filename())
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	31 return newlyaddedandmodifiedfiles
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	32
10401 6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	33 def parsealiases(cmd):
6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	34 return cmd.lstrip("^").split("\|")
6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	35
24356 a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	36 def setupwrapcolorwrite(ui):
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	37 # wrap ui.write so diff output can be labeled/colorized
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	38 def wrapwrite(orig, args, *kw):
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	39 label = kw.pop('label', '')
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	40 for chunk, l in patch.difflabel(lambda: args):
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	41 orig(chunk, label=label + l)
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	42
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	43 oldwrite = ui.write
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	44 def wrap(args, *kwargs):
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	45 return wrapwrite(oldwrite, args, *kwargs)
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	46 setattr(ui, 'write', wrap)
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	47 return oldwrite
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	48
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	49 def filterchunks(ui, originalhunks, usecurses, testfile, operation=None):
24343 69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	50 if usecurses:
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	51 if testfile:
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	52 recordfn = crecordmod.testdecorator(testfile,
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	53 crecordmod.testchunkselector)
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	54 else:
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	55 recordfn = crecordmod.chunkselector
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	56
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	57 return crecordmod.filterpatch(ui, originalhunks, recordfn, operation)
24343 69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	58
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	59 else:
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	60 return patch.filterpatch(ui, originalhunks, operation)
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	61
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	62 def recordfilter(ui, originalhunks, operation=None):
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	63 """ Prompts the user to filter the originalhunks and return a list of
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	64 selected hunks.
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	65 operation is used for ui purposes to indicate the user
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	66 what kind of filtering they are doing: reverting, commiting, shelving, etc.
25358 31f3636e9296 record: precise documentation Laurent Charignon <lcharignon@fb.com> parents: 25310 diff changeset	67 operation has to be a translated string.
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	68 """
24357 2da601ab3125 record: refactor the filtering code Laurent Charignon <lcharignon@fb.com> parents: 24356 diff changeset	69 usecurses = ui.configbool('experimental', 'crecord', False)
2da601ab3125 record: refactor the filtering code Laurent Charignon <lcharignon@fb.com> parents: 24356 diff changeset	70 testfile = ui.config('experimental', 'crecordtest', None)
24358 8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	71 oldwrite = setupwrapcolorwrite(ui)
8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	72 try:
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	73 newchunks = filterchunks(ui, originalhunks, usecurses, testfile,
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	74 operation)
24358 8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	75 finally:
8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	76 ui.write = oldwrite
24357 2da601ab3125 record: refactor the filtering code Laurent Charignon <lcharignon@fb.com> parents: 24356 diff changeset	77 return newchunks
2da601ab3125 record: refactor the filtering code Laurent Charignon <lcharignon@fb.com> parents: 24356 diff changeset	78
24309 fefcafda10b8 record: change interface of dorecord to accept new filters Laurent Charignon <lcharignon@fb.com> parents: 24306 diff changeset	79 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
fefcafda10b8 record: change interface of dorecord to accept new filters Laurent Charignon <lcharignon@fb.com> parents: 24306 diff changeset	80 filterfn, pats, *opts):
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	81 import merge as mergemod
24345 01b39149ebb3 record: minor refactoring of dorecord Laurent Charignon <lcharignon@fb.com> parents: 24343 diff changeset	82
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	83 if not ui.interactive():
25795 69145daacdfa cmdutil: allow callers of cmdutil.dorecord to omit suggestion FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25763 diff changeset	84 if cmdsuggest:
69145daacdfa cmdutil: allow callers of cmdutil.dorecord to omit suggestion FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25763 diff changeset	85 msg = _('running non-interactively, use %s instead') % cmdsuggest
69145daacdfa cmdutil: allow callers of cmdutil.dorecord to omit suggestion FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25763 diff changeset	86 else:
69145daacdfa cmdutil: allow callers of cmdutil.dorecord to omit suggestion FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25763 diff changeset	87 msg = _('running non-interactively')
69145daacdfa cmdutil: allow callers of cmdutil.dorecord to omit suggestion FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25763 diff changeset	88 raise util.Abort(msg)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	89
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	90 # make sure username is set before going interactive
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	91 if not opts.get('user'):
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	92 ui.username() # raise exception, username not provided
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	93
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	94 def recordfunc(ui, repo, message, match, opts):
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	95 """This is generic record driver.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	96
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	97 Its job is to interactively filter local changes, and
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	98 accordingly prepare working directory into a state in which the
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	99 job can be delegated to a non-interactive commit command such as
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	100 'commit' or 'qrefresh'.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	101
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	102 After the actual job is done by non-interactive command, the
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	103 working directory is restored to its original state.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	104
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	105 In the end we'll record interesting changes, and everything else
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	106 will be left in place, so the user can continue working.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	107 """
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	108
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	109 checkunfinished(repo, commit=True)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	110 merge = len(repo[None].parents()) > 1
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	111 if merge:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	112 raise util.Abort(_('cannot partially commit a merge '
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	113 '(use "hg commit" instead)'))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	114
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	115 status = repo.status(match=match)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	116 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	117 diffopts.nodates = True
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	118 diffopts.git = True
24341 616c01b69898 record: change interface of the filtering function Laurent Charignon <lcharignon@fb.com> parents: 24311 diff changeset	119 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
616c01b69898 record: change interface of the filtering function Laurent Charignon <lcharignon@fb.com> parents: 24311 diff changeset	120 originalchunks = patch.parsepatch(originaldiff)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	121
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	122 # 1. filter patch, so we have intending-to apply subset of it
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	123 try:
24341 616c01b69898 record: change interface of the filtering function Laurent Charignon <lcharignon@fb.com> parents: 24311 diff changeset	124 chunks = filterfn(ui, originalchunks)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	125 except patch.PatchError as err:
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	126 raise util.Abort(_('error parsing patch: %s') % err)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	127
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24843 diff changeset	128 # We need to keep a backup of files that have been newly added and
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24843 diff changeset	129 # modified during the recording process because there is a previous
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24843 diff changeset	130 # version without the edit in the workdir
25257 07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	131 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	132 contenders = set()
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	133 for h in chunks:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	134 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	135 contenders.update(set(h.files()))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	136 except AttributeError:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	137 pass
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	138
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	139 changed = status.modified + status.added + status.removed
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	140 newfiles = [f for f in changed if f in contenders]
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	141 if not newfiles:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	142 ui.status(_('no changes to record\n'))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	143 return 0
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	144
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	145 modified = set(status.modified)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	146
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	147 # 2. backup changed files, so we can restore them in the end
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	148
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	149 if backupall:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	150 tobackup = changed
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	151 else:
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24843 diff changeset	152 tobackup = [f for f in newfiles if f in modified or f in \
8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24843 diff changeset	153 newlyaddedandmodifiedfiles]
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	154 backups = {}
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	155 if tobackup:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	156 backupdir = repo.join('record-backups')
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	157 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	158 os.mkdir(backupdir)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	159 except OSError as err:
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	160 if err.errno != errno.EEXIST:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	161 raise
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	162 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	163 # backup continues
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	164 for f in tobackup:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	165 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	166 dir=backupdir)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	167 os.close(fd)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	168 ui.debug('backup %r as %r\n' % (f, tmpname))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	169 util.copyfile(repo.wjoin(f), tmpname)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	170 shutil.copystat(repo.wjoin(f), tmpname)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	171 backups[f] = tmpname
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	172
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	173 fp = cStringIO.StringIO()
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	174 for c in chunks:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	175 fname = c.filename()
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24720 diff changeset	176 if fname in backups:
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	177 c.write(fp)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	178 dopatch = fp.tell()
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	179 fp.seek(0)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	180
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24864 diff changeset	181 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	182 # 3a. apply filtered patch to clean repo (clean)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	183 if backups:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	184 # Equivalent to hg.revert
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	185 choices = lambda key: key in backups
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	186 mergemod.update(repo, repo.dirstate.p1(),
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	187 False, True, choices)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	188
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	189 # 3b. (apply)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	190 if dopatch:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	191 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	192 ui.debug('applying patch\n')
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	193 ui.debug(fp.getvalue())
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	194 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	195 except patch.PatchError as err:
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	196 raise util.Abort(str(err))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	197 del fp
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	198
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	199 # 4. We prepared working directory according to filtered
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	200 # patch. Now is the time to delegate the job to
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	201 # commit/qrefresh or the like!
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	202
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	203 # Make all of the pathnames absolute.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	204 newfiles = [repo.wjoin(nf) for nf in newfiles]
24476 1378f20c8564 record: change return value of recording code Laurent Charignon <lcharignon@fb.com> parents: 24475 diff changeset	205 return commitfunc(ui, repo, newfiles, *opts)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	206 finally:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	207 # 5. finally restore backed-up files
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	208 try:
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	209 dirstate = repo.dirstate
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	210 for realname, tmpname in backups.iteritems():
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	211 ui.debug('restoring %r to %r\n' % (tmpname, realname))
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	212
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	213 if dirstate[realname] == 'n':
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	214 # without normallookup, restoring timestamp
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	215 # may cause partially committed files
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	216 # to be treated as unmodified
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	217 dirstate.normallookup(realname)
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	218
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	219 util.copyfile(tmpname, repo.wjoin(realname))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	220 # Our calls to copystat() here and above are a
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	221 # hack to trick any editors that have f open that
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	222 # we haven't modified them.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	223 #
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	224 # Also note that this racy as an editor could
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	225 # notice the file's mtime before we've finished
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	226 # writing it.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	227 shutil.copystat(tmpname, repo.wjoin(realname))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	228 os.unlink(tmpname)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	229 if tobackup:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	230 os.rmdir(backupdir)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	231 except OSError:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	232 pass
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	233
25758 c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	234 def recordinwlock(ui, repo, message, match, opts):
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	235 wlock = repo.wlock()
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	236 try:
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	237 return recordfunc(ui, repo, message, match, opts)
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	238 finally:
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	239 wlock.release()
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	240
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	241 return commit(ui, repo, recordinwlock, pats, opts)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	242
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	243 def findpossible(cmd, table, strict=False):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	244 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	245 Return cmd -> (aliases, command table entry)
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	246 for each matching command.
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	247 Return debug commands (or their aliases) only if no normal command matches.
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	248 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	249 choice = {}
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	250 debugchoice = {}
15600 195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	251
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	252 if cmd in table:
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	253 # short-circuit exact matches, "log" alias beats "^log\|history"
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	254 keys = [cmd]
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	255 else:
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	256 keys = table.keys()
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	257
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	258 allcmds = []
15600 195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	259 for e in keys:
10401 6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	260 aliases = parsealiases(e)
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	261 allcmds.extend(aliases)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	262 found = None
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	263 if cmd in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	264 found = cmd
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	265 elif not strict:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	266 for a in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	267 if a.startswith(cmd):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	268 found = a
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	269 break
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	270 if found is not None:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	271 if aliases[0].startswith("debug") or found.startswith("debug"):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	272 debugchoice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	273 else:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	274 choice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	275
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	276 if not choice and debugchoice:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	277 choice = debugchoice
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	278
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	279 return choice, allcmds
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	280
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	281 def findcmd(cmd, table, strict=True):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	282 """Return (aliases, command table entry) for command string."""
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	283 choice, allcmds = findpossible(cmd, table, strict)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	284
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5843 diff changeset	285 if cmd in choice:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	286 return choice[cmd]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	287
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	288 if len(choice) > 1:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	289 clist = choice.keys()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	290 clist.sort()
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7404 diff changeset	291 raise error.AmbiguousCommand(cmd, clist)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	292
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	293 if choice:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	294 return choice.values()[0]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	295
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	296 raise error.UnknownCommand(cmd, allcmds)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	297
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	298 def findrepo(p):
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	299 while not os.path.isdir(os.path.join(p, ".hg")):
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	300 oldp, p = p, os.path.dirname(p)
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	301 if p == oldp:
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	302 return None
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	303
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	304 return p
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	305
24472 1bf71faf042e cmdutil: allow bailifchanged to ignore merging in progress FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24471 diff changeset	306 def bailifchanged(repo, merge=True):
1bf71faf042e cmdutil: allow bailifchanged to ignore merging in progress FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24471 diff changeset	307 if merge and repo.dirstate.p2() != nullid:
5716 be367cbafe70 cmdutil: make bail_if_changed bail on uncommitted merge Matt Mackall <mpm@selenic.com> parents: 5610 diff changeset	308 raise util.Abort(_('outstanding uncommitted merge'))
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	309 modified, added, removed, deleted = repo.status()[:4]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	310 if modified or added or removed or deleted:
19804 061ce98c888d cmdutil.bailifchanged: standardize error message for dirty working dir Siddharth Agarwal <sid0@fb.com> parents: 19730 diff changeset	311 raise util.Abort(_('uncommitted changes'))
15231 cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 15214 diff changeset	312 ctx = repo[None]
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18340 diff changeset	313 for s in sorted(ctx.substate):
24471 1ff35d76421c subrepo: add bailifchanged to centralize raising Abort if subrepo is dirty FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24464 diff changeset	314 ctx.sub(s).bailifchanged()
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	315
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14518 diff changeset	316 def logmessage(ui, opts):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	317 """ get the log message according to -m and -l option """
7667 bd5c37d792e6 cmdutil.logmessage: options should be optional Alexander Solovyov <piranha@piranha.org.ua> parents: 7643 diff changeset	318 message = opts.get('message')
bd5c37d792e6 cmdutil.logmessage: options should be optional Alexander Solovyov <piranha@piranha.org.ua> parents: 7643 diff changeset	319 logfile = opts.get('logfile')
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	320
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	321 if message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	322 raise util.Abort(_('options --message and --logfile are mutually '
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	323 'exclusive'))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	324 if not message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	325 try:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	326 if logfile == '-':
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14518 diff changeset	327 message = ui.fin.read()
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	328 else:
14249 f4766e1bb0b3 cmdutil: normalize log message eols when reading from file Patrick Mezard <pmezard@gmail.com> parents: 14232 diff changeset	329 message = '\n'.join(util.readfile(logfile).splitlines())
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	330 except IOError as inst:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	331 raise util.Abort(_("can't read commit message '%s': %s") %
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	332 (logfile, inst.strerror))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	333 return message
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	334
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	335 def mergeeditform(ctxorbool, baseformname):
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	336 """return appropriate editform name (referencing a committemplate)
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	337
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	338 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
22248 75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	339 merging is committed.
75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	340
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	341 This returns baseformname with '.merge' appended if it is a merge,
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	342 otherwise '.normal' is appended.
22248 75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	343 """
75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	344 if isinstance(ctxorbool, bool):
75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	345 if ctxorbool:
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	346 return baseformname + ".merge"
22248 75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	347 elif 1 < len(ctxorbool.parents()):
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	348 return baseformname + ".merge"
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	349
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	350 return baseformname + ".normal"
22248 75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	351
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	352 def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	353 editform='', **opts):
21419 272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	354 """get appropriate commit message editor according to '--edit' option
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	355
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	356 'finishdesc' is a function to be called with edited commit message
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	357 (= 'description' of the new changeset) just after editing, but
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	358 before checking empty-ness. It should return actual text to be
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	359 stored into history. This allows to change description before
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	360 storing.
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	361
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	362 'extramsg' is a extra message to be shown in the editor instead of
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	363 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	364 is automatically added.
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	365
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	366 'editform' is a dot-separated list of names, to distinguish
6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	367 the purpose of commit text editing.
6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	368
21419 272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	369 'getcommiteditor' returns 'commitforceeditor' regardless of
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	370 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	371 they are specific for usage in MQ.
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	372 """
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	373 if edit or finishdesc or extramsg:
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	374 return lambda r, c, s: commitforceeditor(r, c, s,
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	375 finishdesc=finishdesc,
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	376 extramsg=extramsg,
6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	377 editform=editform)
6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	378 elif editform:
6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	379 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
21405 dcf20f244c2a cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21241 diff changeset	380 else:
dcf20f244c2a cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21241 diff changeset	381 return commiteditor
dcf20f244c2a cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21241 diff changeset	382
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	383 def loglimit(opts):
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	384 """get the log limit according to option -l/--limit"""
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	385 limit = opts.get('limit')
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	386 if limit:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	387 try:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	388 limit = int(limit)
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	389 except ValueError:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	390 raise util.Abort(_('limit must be a positive integer'))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	391 if limit <= 0:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	392 raise util.Abort(_('limit must be positive'))
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	393 else:
10111 27457d31ae3f cmdutil: replace sys.maxint with None as default value in loglimit Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10061 diff changeset	394 limit = None
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	395 return limit
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	396
14986 70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	397 def makefilename(repo, pat, node, desc=None,
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	398 total=None, seqno=None, revwidth=None, pathname=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	399 node_expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	400 'H': lambda: hex(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	401 'R': lambda: str(repo.changelog.rev(node)),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	402 'h': lambda: short(node),
14986 70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	403 'm': lambda: re.sub('[^\w]', '_', str(desc))
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	404 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	405 expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	406 '%': lambda: '%',
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	407 'b': lambda: os.path.basename(repo.root),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	408 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	409
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	410 try:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	411 if node:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	412 expander.update(node_expander)
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	413 if node:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	414 expander['r'] = (lambda:
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	415 str(repo.changelog.rev(node)).zfill(revwidth or 0))
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	416 if total is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	417 expander['N'] = lambda: str(total)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	418 if seqno is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	419 expander['n'] = lambda: str(seqno)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	420 if total is not None and seqno is not None:
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3657 diff changeset	421 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	422 if pathname is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	423 expander['s'] = lambda: os.path.basename(pathname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	424 expander['d'] = lambda: os.path.dirname(pathname) or '.'
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	425 expander['p'] = lambda: pathname
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	426
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	427 newname = []
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	428 patlen = len(pat)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	429 i = 0
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	430 while i < patlen:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	431 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	432 if c == '%':
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	433 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	434 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	435 c = expander[c]()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	436 newname.append(c)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	437 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	438 return ''.join(newname)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	439 except KeyError as inst:
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8731 diff changeset	440 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 2958 diff changeset	441 inst.args[0])
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	442
14986 70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	443 def makefileobj(repo, pat, node=None, desc=None, total=None,
19944 b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	444 seqno=None, revwidth=None, mode='wb', modemap=None,
18613 1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	445 pathname=None):
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	446
13769 8796fb6af67e cmdutil: fix mode handling in make_file Adrian Buehlmann <adrian@cadifra.com> parents: 13534 diff changeset	447 writable = mode not in ('r', 'rb')
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	448
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	449 if not pat or pat == '-':
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	450 if writable:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	451 fp = repo.ui.fout
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	452 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	453 fp = repo.ui.fin
14948 32302480b402 cmdutil: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14671 diff changeset	454 if util.safehasattr(fp, 'fileno'):
14638 1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	455 return os.fdopen(os.dup(fp.fileno()), mode)
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	456 else:
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	457 # if this fp can't be duped properly, return
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	458 # a dummy object that can be closed
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	459 class wrappedfileobj(object):
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	460 noop = lambda x: None
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	461 def __init__(self, f):
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	462 self.f = f
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	463 def __getattr__(self, attr):
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	464 if attr == 'close':
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	465 return self.noop
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	466 else:
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	467 return getattr(self.f, attr)
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	468
1bdbca0b6604 cmdutil: return a dummy, closable file object if it cannot be duped Idan Kamara <idankk86@gmail.com> parents: 14637 diff changeset	469 return wrappedfileobj(fp)
14948 32302480b402 cmdutil: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14671 diff changeset	470 if util.safehasattr(pat, 'write') and writable:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	471 return pat
14948 32302480b402 cmdutil: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14671 diff changeset	472 if util.safehasattr(pat, 'read') and 'r' in mode:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	473 return pat
18613 1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	474 fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
19944 b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	475 if modemap is not None:
b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	476 mode = modemap.get(fn, mode)
b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	477 if mode == 'wb':
b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	478 modemap[fn] = 'ab'
18613 1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	479 return open(fn, mode)
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	480
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	481 def openrevlog(repo, cmd, file_, opts):
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	482 """opens the changelog, manifest, a filelog or a given revlog"""
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	483 cl = opts['changelog']
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	484 mf = opts['manifest']
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	485 dir = opts['dir']
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	486 msg = None
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	487 if cl and mf:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	488 msg = _('cannot specify --changelog and --manifest at the same time')
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	489 elif cl and dir:
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	490 msg = _('cannot specify --changelog and --dir at the same time')
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	491 elif cl or mf:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	492 if file_:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	493 msg = _('cannot specify filename with --changelog or --manifest')
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	494 elif not repo:
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	495 msg = _('cannot specify --changelog or --manifest or --dir '
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	496 'without a repository')
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	497 if msg:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	498 raise util.Abort(msg)
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	499
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	500 r = None
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	501 if repo:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	502 if cl:
21033 254f55b64e31 debugrevlog: use unfiltered view for changelog Matt Mackall <mpm@selenic.com> parents: 21024 diff changeset	503 r = repo.unfiltered().changelog
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	504 elif dir:
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	505 if 'treemanifest' not in repo.requirements:
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	506 raise util.Abort(_("--dir can only be used on repos with "
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	507 "treemanifest enabled"))
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	508 dirlog = repo.dirlog(file_)
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	509 if len(dirlog):
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	510 r = dirlog
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	511 elif mf:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	512 r = repo.manifest
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	513 elif file_:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	514 filelog = repo.file(file_)
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	515 if len(filelog):
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	516 r = filelog
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	517 if not r:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	518 if not file_:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	519 raise error.CommandError(cmd, _('invalid arguments'))
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	520 if not os.path.isfile(file_):
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	521 raise util.Abort(_("revlog '%s' not found") % file_)
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	522 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False),
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	523 file_[:-2] + ".i")
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	524 return r
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	525
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	526 def copy(ui, repo, pats, opts, rename=False):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	527 # called with the repo lock held
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	528 #
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	529 # hgsep => pathname that uses "/" to separate directories
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	530 # ossep => pathname that uses os.sep to separate directories
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	531 cwd = repo.getcwd()
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	532 targets = {}
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	533 after = opts.get("after")
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	534 dryrun = opts.get("dry_run")
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	535 wctx = repo[None]
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	536
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	537 def walkpat(pat):
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	538 srcs = []
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	539 if after:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	540 badstates = '?'
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	541 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	542 badstates = '?r'
14671 35c2cc322ba8 scmutil: switch match users to supplying contexts Matt Mackall <mpm@selenic.com> parents: 14638 diff changeset	543 m = scmutil.match(repo[None], [pat], opts, globbed=True)
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	544 for abs in repo.walk(m):
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	545 state = repo.dirstate[abs]
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	546 rel = m.rel(abs)
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	547 exact = m.exact(abs)
11223 0d09f2244805 rename: make --after work if source is already in R state Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11177 diff changeset	548 if state in badstates:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	549 if exact and state == '?':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	550 ui.warn(_('%s: not copying - file is not managed\n') % rel)
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	551 if exact and state == 'r':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	552 ui.warn(_('%s: not copying - file has been marked for'
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	553 ' remove\n') % rel)
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	554 continue
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	555 # abs: hgsep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	556 # rel: ossep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	557 srcs.append((abs, rel, exact))
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	558 return srcs
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	559
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	560 # abssrc: hgsep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	561 # relsrc: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	562 # otarget: ossep
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	563 def copyfile(abssrc, relsrc, otarget, exact):
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 19944 diff changeset	564 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
16542 e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	565 if '/' in abstarget:
e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	566 # We cannot normalize abstarget itself, this would prevent
e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	567 # case only renames, like a => A.
e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	568 abspath, absname = abstarget.rsplit('/', 1)
e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	569 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	570 reltarget = repo.pathto(abstarget, cwd)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	571 target = repo.wjoin(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	572 src = repo.wjoin(abssrc)
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	573 state = repo.dirstate[abstarget]
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	574
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: 13945 diff changeset	575 scmutil.checkportable(ui, abstarget)
13945 03f3ce7ca2a8 copy: do not copy file if name is disallowed anyway Adrian Buehlmann <adrian@cadifra.com> parents: 13878 diff changeset	576
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	577 # check for collisions
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	578 prevsrc = targets.get(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	579 if prevsrc is not None:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	580 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	581 (reltarget, repo.pathto(abssrc, cwd),
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	582 repo.pathto(prevsrc, cwd)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	583 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	584
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	585 # check for overwrites
12342 70236d6fd844 rename: do not overwrite existing broken symlinks Patrick Mezard <pmezard@gmail.com> parents: 11950 diff changeset	586 exists = os.path.lexists(target)
16283 6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	587 samefile = False
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	588 if exists and abssrc != abstarget:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	589 if (repo.dirstate.normalize(abssrc) ==
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	590 repo.dirstate.normalize(abstarget)):
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	591 if not rename:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	592 ui.warn(_("%s: can't copy - same file\n") % reltarget)
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	593 return
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	594 exists = False
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	595 samefile = True
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	596
8117 2b30d8488819 remove unnecessary outer parenthesis in if-statements Martin Geisler <mg@lazybytes.net> parents: 8013 diff changeset	597 if not after and exists or after and state in 'mn':
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	598 if not opts['force']:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	599 ui.warn(_('%s: not overwriting - file exists\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	600 reltarget)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	601 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	602
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	603 if after:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	604 if not exists:
11152 e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	605 if rename:
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	606 ui.warn(_('%s: not recording move - %s does not exist\n') %
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	607 (relsrc, reltarget))
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	608 else:
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	609 ui.warn(_('%s: not recording copy - %s does not exist\n') %
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	610 (relsrc, reltarget))
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	611 return
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	612 elif not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	613 try:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	614 if exists:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	615 os.unlink(target)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	616 targetdir = os.path.dirname(target) or '.'
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	617 if not os.path.isdir(targetdir):
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	618 os.makedirs(targetdir)
16283 6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	619 if samefile:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	620 tmp = target + "~hgrename"
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	621 os.rename(src, tmp)
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	622 os.rename(tmp, target)
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	623 else:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	624 util.copyfile(src, target)
14518 a67e866f46f9 workingctx: eliminate remove function Adrian Buehlmann <adrian@cadifra.com> parents: 14442 diff changeset	625 srcexists = True
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	626 except IOError as inst:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	627 if inst.errno == errno.ENOENT:
24364 135b23868f45 commands: replace "working copy" with "working directory" in help/messages Yuya Nishihara <yuya@tcha.org> parents: 24359 diff changeset	628 ui.warn(_('%s: deleted in working directory\n') % relsrc)
14518 a67e866f46f9 workingctx: eliminate remove function Adrian Buehlmann <adrian@cadifra.com> parents: 14442 diff changeset	629 srcexists = False
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	630 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	631 ui.warn(_('%s: cannot copy - %s\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	632 (relsrc, inst.strerror))
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	633 return True # report a failure
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	634
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	635 if ui.verbose or not exact:
7894 caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	636 if rename:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	637 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	638 else:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	639 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	640
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	641 targets[abstarget] = abssrc
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	642
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	643 # fix up dirstate
14321 003d63bb4fa5 scmutil: drop some aliases in cmdutil Matt Mackall <mpm@selenic.com> parents: 14320 diff changeset	644 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
003d63bb4fa5 scmutil: drop some aliases in cmdutil Matt Mackall <mpm@selenic.com> parents: 14320 diff changeset	645 dryrun=dryrun, cwd=cwd)
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	646 if rename and not dryrun:
16283 6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	647 if not after and srcexists and not samefile:
14518 a67e866f46f9 workingctx: eliminate remove function Adrian Buehlmann <adrian@cadifra.com> parents: 14442 diff changeset	648 util.unlinkpath(repo.wjoin(abssrc))
a67e866f46f9 workingctx: eliminate remove function Adrian Buehlmann <adrian@cadifra.com> parents: 14442 diff changeset	649 wctx.forget([abssrc])
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	650
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	651 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	652 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	653 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	654 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	655 def targetpathfn(pat, dest, srcs):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	656 if os.path.isdir(pat):
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 19944 diff changeset	657 abspfx = pathutil.canonpath(repo.root, cwd, pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	658 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	659 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	660 striplen = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	661 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	662 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	663 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	664 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	665 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	666 elif destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	667 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	668 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	669 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	670 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	671 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	672
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	673 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	674 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	675 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	676 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	677 def targetpathafterfn(pat, dest, srcs):
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	678 if matchmod.patkind(pat):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	679 # a mercurial pattern
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	680 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	681 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	682 else:
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 19944 diff changeset	683 abspfx = pathutil.canonpath(repo.root, cwd, pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	684 if len(abspfx) < len(srcs[0][0]):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	685 # A directory. Either the target path contains the last
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	686 # component of the source path or it does not.
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	687 def evalpath(striplen):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	688 score = 0
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	689 for s in srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	690 t = os.path.join(dest, util.localpath(s[0])[striplen:])
12357 cb59654c2c7a Restore lexists() changes lost in e0ee3e822a9a merge Patrick Mezard <pmezard@gmail.com> parents: 12345 diff changeset	691 if os.path.lexists(t):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	692 score += 1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	693 return score
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	694
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	695 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	696 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	697 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	698 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	699 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	700 score = evalpath(striplen)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	701 striplen1 = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	702 if striplen1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	703 striplen1 += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	704 if evalpath(striplen1) > score:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	705 striplen = striplen1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	706 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	707 util.localpath(p)[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	708 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	709 # a file
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	710 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	711 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	712 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	713 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	714 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	715 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	716
14321 003d63bb4fa5 scmutil: drop some aliases in cmdutil Matt Mackall <mpm@selenic.com> parents: 14320 diff changeset	717 pats = scmutil.expandpats(pats)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	718 if not pats:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	719 raise util.Abort(_('no source or destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	720 if len(pats) == 1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	721 raise util.Abort(_('no destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	722 dest = pats.pop()
6258 c24f4b3f156b Fix issue995 (copy --after and symlinks pointing to a directory) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	723 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	724 if not destdirexists:
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	725 if len(pats) > 1 or matchmod.patkind(pats[0]):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	726 raise util.Abort(_('with multiple sources, destination must be an '
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	727 'existing directory'))
5843 83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5836 diff changeset	728 if util.endswithsep(dest):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	729 raise util.Abort(_('destination %s is not a directory') % dest)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	730
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	731 tfn = targetpathfn
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	732 if after:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	733 tfn = targetpathafterfn
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	734 copylist = []
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	735 for pat in pats:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	736 srcs = walkpat(pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	737 if not srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	738 continue
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	739 copylist.append((tfn(pat, dest, srcs), srcs))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	740 if not copylist:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	741 raise util.Abort(_('no files to copy'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	742
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	743 errors = 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	744 for targetpath, srcs in copylist:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	745 for abssrc, relsrc, exact in srcs:
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	746 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	747 errors += 1
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	748
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	749 if errors:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	750 ui.warn(_('(consider using --after)\n'))
5609 a783d3627144 copy: move rename logic Matt Mackall <mpm@selenic.com> parents: 5608 diff changeset	751
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11152 diff changeset	752 return errors != 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	753
9513 ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	754 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
10012 2bfe1a23dafa cmdutil: service: add appendpid parameter to append pids to pid file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9975 diff changeset	755 runargs=None, appendpid=False):
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	756 '''Run a command as a service.'''
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	757
19867 edce20ebe1f3 cmdutil.service: move pidfile writing to a local function Siddharth Agarwal <sid0@fb.com> parents: 19804 diff changeset	758 def writepid(pid):
edce20ebe1f3 cmdutil.service: move pidfile writing to a local function Siddharth Agarwal <sid0@fb.com> parents: 19804 diff changeset	759 if opts['pid_file']:
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	760 if appendpid:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	761 mode = 'a'
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	762 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	763 mode = 'w'
19867 edce20ebe1f3 cmdutil.service: move pidfile writing to a local function Siddharth Agarwal <sid0@fb.com> parents: 19804 diff changeset	764 fp = open(opts['pid_file'], mode)
edce20ebe1f3 cmdutil.service: move pidfile writing to a local function Siddharth Agarwal <sid0@fb.com> parents: 19804 diff changeset	765 fp.write(str(pid) + '\n')
edce20ebe1f3 cmdutil.service: move pidfile writing to a local function Siddharth Agarwal <sid0@fb.com> parents: 19804 diff changeset	766 fp.close()
edce20ebe1f3 cmdutil.service: move pidfile writing to a local function Siddharth Agarwal <sid0@fb.com> parents: 19804 diff changeset	767
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	768 if opts['daemon'] and not opts['daemon_pipefds']:
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	769 # Signal child process startup with file removal
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	770 lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	771 os.close(lockfd)
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	772 try:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	773 if not runargs:
10239 8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10238 diff changeset	774 runargs = util.hgcmd() + sys.argv[1:]
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	775 runargs.append('--daemon-pipefds=%s' % lockpath)
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	776 # Don't pass --cwd to the child process, because we've already
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	777 # changed directory.
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	778 for i in xrange(1, len(runargs)):
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	779 if runargs[i].startswith('--cwd='):
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	780 del runargs[i]
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	781 break
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	782 elif runargs[i].startswith('--cwd'):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	783 del runargs[i:i + 2]
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	784 break
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	785 def condfn():
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	786 return not os.path.exists(lockpath)
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	787 pid = util.rundetached(runargs, condfn)
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	788 if pid < 0:
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	789 raise util.Abort(_('child process failed to start'))
19868 0532c8f8e911 cmdutil.service: move pidfile writing to the parent in daemon mode Siddharth Agarwal <sid0@fb.com> parents: 19867 diff changeset	790 writepid(pid)
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	791 finally:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	792 try:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	793 os.unlink(lockpath)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	794 except OSError as e:
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	795 if e.errno != errno.ENOENT:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	796 raise
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	797 if parentfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	798 return parentfn(pid)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	799 else:
9896 2c2f7593ffc4 cmdutil.service: do not _exit(0) in the parent process Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9668 diff changeset	800 return
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	801
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	802 if initfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	803 initfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	804
19868 0532c8f8e911 cmdutil.service: move pidfile writing to the parent in daemon mode Siddharth Agarwal <sid0@fb.com> parents: 19867 diff changeset	805 if not opts['daemon']:
0532c8f8e911 cmdutil.service: move pidfile writing to the parent in daemon mode Siddharth Agarwal <sid0@fb.com> parents: 19867 diff changeset	806 writepid(os.getpid())
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	807
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	808 if opts['daemon_pipefds']:
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	809 lockpath = opts['daemon_pipefds']
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	810 try:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	811 os.setsid()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	812 except AttributeError:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	813 pass
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	814 os.unlink(lockpath)
10240 3af4b39afe2a cmdutil: hide child window created by win32 spawndetached() Patrick Mezard <pmezard@gmail.com> parents: 10239 diff changeset	815 util.hidewindow()
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	816 sys.stdout.flush()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	817 sys.stderr.flush()
8789 e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	818
17391 fc24c10424d2 util: replace util.nulldev with os.devnull Ross Lagerwall <rosslagerwall@gmail.com> parents: 17308 diff changeset	819 nullfd = os.open(os.devnull, os.O_RDWR)
8789 e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	820 logfilefd = nullfd
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	821 if logfile:
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	822 logfilefd = os.open(logfile, os.O_RDWR \| os.O_CREAT \| os.O_APPEND)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	823 os.dup2(nullfd, 0)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	824 os.dup2(logfilefd, 1)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	825 os.dup2(logfilefd, 2)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	826 if nullfd not in (0, 1, 2):
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	827 os.close(nullfd)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	828 if logfile and logfilefd not in (0, 1, 2):
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	829 os.close(logfilefd)
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	830
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	831 if runfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	832 return runfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	833
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	834 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	835 """Utility function used by commands.import to import a single patch
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	836
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	837 This function is explicitly defined here to help the evolve extension to
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	838 wrap this part of the import logic.
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	839
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	840 The API is currently a bit ugly because it a simple code translation from
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	841 the import command. Feel free to make it better.
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	842
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	843 :hunk: a patch (as a binary string)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	844 :parents: nodes that will be parent of the created commit
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	845 :opts: the full dict of option passed to the import command
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	846 :msgs: list to save commit message to.
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	847 (used in case we need to save it when failing)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	848 :updatefunc: a function that update a repo to a given node
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	849 updatefunc(<repo>, <node>)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	850 """
25930 221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	851 # avoid cycle context -> subrepo -> cmdutil
221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	852 import context
26547 b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	853 extractdata = patch.extract(ui, hunk)
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	854 tmpname = extractdata.get('filename')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	855 message = extractdata.get('message')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	856 user = extractdata.get('user')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	857 date = extractdata.get('date')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	858 branch = extractdata.get('branch')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	859 nodeid = extractdata.get('nodeid')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	860 p1 = extractdata.get('p1')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	861 p2 = extractdata.get('p2')
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	862
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	863 update = not opts.get('bypass')
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	864 strip = opts["strip"]
24259 5ac8ce04baa2 cmdutil.tryimportone: allow importing relative patches into the working dir Siddharth Agarwal <sid0@fb.com> parents: 24222 diff changeset	865 prefix = opts["prefix"]
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	866 sim = float(opts.get('similarity') or 0)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	867 if not tmpname:
21553 bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	868 return (None, None, False)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	869 msg = _('applied to working directory')
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	870
21553 bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	871 rejects = False
24995 0579b0c2ea2b tryimportone: use dirstateguard instead of beginparentchange/endparentchange FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24993 diff changeset	872 dsguard = None
21553 bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	873
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	874 try:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	875 cmdline_message = logmessage(ui, opts)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	876 if cmdline_message:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	877 # pickup the cmdline msg
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	878 message = cmdline_message
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	879 elif message:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	880 # pickup the patch msg
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	881 message = message.strip()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	882 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	883 # launch the editor
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	884 message = None
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	885 ui.debug('message:\n%s\n' % message)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	886
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	887 if len(parents) == 1:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	888 parents.append(repo[nullid])
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	889 if opts.get('exact'):
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	890 if not nodeid or not p1:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	891 raise util.Abort(_('not a Mercurial patch'))
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	892 p1 = repo[p1]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	893 p2 = repo[p2 or nullid]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	894 elif p2:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	895 try:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	896 p1 = repo[p1]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	897 p2 = repo[p2]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	898 # Without any options, consider p2 only if the
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	899 # patch is being applied on top of the recorded
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	900 # first parent.
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	901 if p1 != parents[0]:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	902 p1 = parents[0]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	903 p2 = repo[nullid]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	904 except error.RepoError:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	905 p1, p2 = parents
22303 0c838e7459a5 import: show the warning message for failure of merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22301 diff changeset	906 if p2.node() == nullid:
0c838e7459a5 import: show the warning message for failure of merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22301 diff changeset	907 ui.warn(_("warning: import the patch as a normal revision\n"
0c838e7459a5 import: show the warning message for failure of merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22301 diff changeset	908 "(use --exact to import the patch as a merge)\n"))
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	909 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	910 p1, p2 = parents
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	911
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	912 n = None
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	913 if update:
24995 0579b0c2ea2b tryimportone: use dirstateguard instead of beginparentchange/endparentchange FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24993 diff changeset	914 dsguard = dirstateguard(repo, 'tryimportone')
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	915 if p1 != parents[0]:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	916 updatefunc(repo, p1.node())
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	917 if p2 != parents[1]:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	918 repo.setparents(p1.node(), p2.node())
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	919
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	920 if opts.get('exact') or opts.get('import_branch'):
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	921 repo.dirstate.setbranch(branch or 'default')
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	922
21553 bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	923 partial = opts.get('partial', False)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	924 files = set()
21553 bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	925 try:
24259 5ac8ce04baa2 cmdutil.tryimportone: allow importing relative patches into the working dir Siddharth Agarwal <sid0@fb.com> parents: 24222 diff changeset	926 patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix,
5ac8ce04baa2 cmdutil.tryimportone: allow importing relative patches into the working dir Siddharth Agarwal <sid0@fb.com> parents: 24222 diff changeset	927 files=files, eolmode=None, similarity=sim / 100.0)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	928 except patch.PatchError as e:
21553 bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	929 if not partial:
bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	930 raise util.Abort(str(e))
bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	931 if partial:
bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	932 rejects = True
bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	933
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	934 files = list(files)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	935 if opts.get('no_commit'):
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	936 if message:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	937 msgs.append(message)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	938 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	939 if opts.get('exact') or p2:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	940 # If you got here, you either use --force and know what
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	941 # you are doing or used --exact or a merge patch while
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	942 # being updated to its first parent.
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	943 m = None
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	944 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	945 m = scmutil.matchfiles(repo, files or [])
22250 f3200bf460a8 import: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22249 diff changeset	946 editform = mergeeditform(repo[None], 'import.normal')
22278 ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	947 if opts.get('exact'):
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	948 editor = None
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	949 else:
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	950 editor = getcommiteditor(editform=editform, **opts)
25020 747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	951 allowemptyback = repo.ui.backupconfig('ui', 'allowemptycommit')
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	952 try:
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	953 if partial:
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	954 repo.ui.setconfig('ui', 'allowemptycommit', True)
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	955 n = repo.commit(message, opts.get('user') or user,
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	956 opts.get('date') or date, match=m,
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	957 editor=editor)
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	958 finally:
747055706e85 import: use ui.allowemptycommit to allow empty commits Durham Goode <durham@fb.com> parents: 24995 diff changeset	959 repo.ui.restoreconfig(allowemptyback)
24995 0579b0c2ea2b tryimportone: use dirstateguard instead of beginparentchange/endparentchange FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24993 diff changeset	960 dsguard.close()
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	961 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	962 if opts.get('exact') or opts.get('import_branch'):
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	963 branch = branch or 'default'
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	964 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	965 branch = p1.branch()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	966 store = patch.filestore()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	967 try:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	968 files = set()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	969 try:
24260 76225ab5a5da cmdutil.tryimportone: allow importing relative patches with --bypass Siddharth Agarwal <sid0@fb.com> parents: 24259 diff changeset	970 patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	971 files, eolmode=None)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	972 except patch.PatchError as e:
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	973 raise util.Abort(str(e))
22278 ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	974 if opts.get('exact'):
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	975 editor = None
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	976 else:
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	977 editor = getcommiteditor(editform='import.bypass')
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	978 memctx = context.makememctx(repo, (p1.node(), p2.node()),
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	979 message,
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	980 opts.get('user') or user,
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	981 opts.get('date') or date,
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	982 branch, files, store,
22011 97acb4504704 import: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22010 diff changeset	983 editor=editor)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	984 n = memctx.commit()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	985 finally:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	986 store.close()
22485 efedda4aed49 import: let --exact 'work' with --no-commit (issue4376) Matt Mackall <mpm@selenic.com> parents: 22427 diff changeset	987 if opts.get('exact') and opts.get('no_commit'):
efedda4aed49 import: let --exact 'work' with --no-commit (issue4376) Matt Mackall <mpm@selenic.com> parents: 22427 diff changeset	988 # --exact with --no-commit is still useful in that it does merge
efedda4aed49 import: let --exact 'work' with --no-commit (issue4376) Matt Mackall <mpm@selenic.com> parents: 22427 diff changeset	989 # and branch bits
efedda4aed49 import: let --exact 'work' with --no-commit (issue4376) Matt Mackall <mpm@selenic.com> parents: 22427 diff changeset	990 ui.warn(_("warning: can't check exact import with --no-commit\n"))
efedda4aed49 import: let --exact 'work' with --no-commit (issue4376) Matt Mackall <mpm@selenic.com> parents: 22427 diff changeset	991 elif opts.get('exact') and hex(n) != nodeid:
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	992 raise util.Abort(_('patch is damaged or loses information'))
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	993 if n:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	994 # i18n: refers to a short changeset id
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	995 msg = _('created %s') % short(n)
21553 bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	996 return (msg, n, rejects)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	997 finally:
24995 0579b0c2ea2b tryimportone: use dirstateguard instead of beginparentchange/endparentchange FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24993 diff changeset	998 lockmod.release(dsguard)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	999 os.unlink(tmpname)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1000
26545 e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1001 # facility to let extensions include additional data in an exported patch
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1002 # list of identifiers to be executed in order
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1003 extraexport = []
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1004 # mapping from identifier to actual export function
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1005 # function as to return a string to be added to the header or None
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1006 # it is given two arguments (sequencenumber, changectx)
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1007 extraexportmap = {}
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1008
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1009 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
26229 d1530c6e8613 extdiff: enable -I/-X with --patch Matt Harbison <matt_harbison@yahoo.com> parents: 26222 diff changeset	1010 opts=None, match=None):
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1011 '''export changesets as hg patches.'''
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1012
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1013 total = len(revs)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1014 revwidth = max([len(str(rev)) for rev in revs])
18613 1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	1015 filemode = {}
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1016
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1017 def single(rev, seqno, fp):
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1018 ctx = repo[rev]
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1019 node = ctx.node()
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1020 parents = [p.node() for p in ctx.parents() if p]
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1021 branch = ctx.branch()
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1022 if switch_parent:
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1023 parents.reverse()
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1024
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1025 if parents:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1026 prev = parents[0]
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1027 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1028 prev = nullid
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1029
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13386 diff changeset	1030 shouldclose = False
17460 a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1031 if not fp and len(template) > 0:
14986 70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	1032 desc_lines = ctx.description().rstrip().split('\n')
70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	1033 desc = desc_lines[0] #Commit always has a first line.
70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	1034 fp = makefileobj(repo, template, node, desc=desc, total=total,
18613 1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	1035 seqno=seqno, revwidth=revwidth, mode='wb',
1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	1036 modemap=filemode)
13467 31aa2e5b0750 export: only close files which export itself has opened Waqas Hussain <waqas20@gmail.com> parents: 13400 diff changeset	1037 if fp != template:
31aa2e5b0750 export: only close files which export itself has opened Waqas Hussain <waqas20@gmail.com> parents: 13400 diff changeset	1038 shouldclose = True
17460 a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1039 if fp and fp != sys.stdout and util.safehasattr(fp, 'name'):
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1040 repo.ui.note("%s\n" % fp.name)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1041
17460 a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1042 if not fp:
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1043 write = repo.ui.write
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1044 else:
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1045 def write(s, **kw):
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1046 fp.write(s)
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1047
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1048 write("# HG changeset patch\n")
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1049 write("# User %s\n" % ctx.user())
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1050 write("# Date %d %d\n" % ctx.date())
18648 76b69cccb07a export: show 'Date' header in a format that also is readable for humans Mads Kiilerich <mads@kiilerich.com> parents: 18613 diff changeset	1051 write("# %s\n" % util.datestr(ctx.date()))
11821 15aa42aaae4c cmdutil: remove unnecessary parenthesis Martin Geisler <mg@aragost.com> parents: 11635 diff changeset	1052 if branch and branch != 'default':
17460 a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1053 write("# Branch %s\n" % branch)
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1054 write("# Node ID %s\n" % hex(node))
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1055 write("# Parent %s\n" % hex(prev))
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1056 if len(parents) > 1:
17460 a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1057 write("# Parent %s\n" % hex(parents[1]))
26545 e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1058
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1059 for headerid in extraexport:
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1060 header = extraexportmap[headerid](seqno, ctx)
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1061 if header is not None:
e99c3846d78a export: introduce a generic way to add patch header on export Pierre-Yves David <pierre-yves.david@fb.com> parents: 26533 diff changeset	1062 write('# %s\n' % header)
17460 a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1063 write(ctx.description().rstrip())
a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1064 write("\n\n")
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1065
26229 d1530c6e8613 extdiff: enable -I/-X with --patch Matt Harbison <matt_harbison@yahoo.com> parents: 26222 diff changeset	1066 for chunk, label in patch.diffui(repo, prev, node, match, opts=opts):
17460 a306837f8c87 color: enabled color support for export command (issue1507) Ankur Dahiya <ankurd@fb.com> parents: 17424 diff changeset	1067 write(chunk, label=label)
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1068
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13386 diff changeset	1069 if shouldclose:
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13386 diff changeset	1070 fp.close()
13081 79184986658c export: flush the file pointer between patches Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13047 diff changeset	1071
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1072 for seqno, rev in enumerate(revs):
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1073 single(rev, seqno + 1, fp)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1074
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1075 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1076 changes=None, stat=False, fp=None, prefix='',
24455 16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	1077 root='', listsubrepos=False):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1078 '''show diff or diffstat.'''
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1079 if fp is None:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1080 write = ui.write
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1081 else:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1082 def write(s, **kw):
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1083 fp.write(s)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1084
24455 16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	1085 if root:
16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	1086 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
24431 a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1087 else:
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1088 relroot = ''
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1089 if relroot != '':
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1090 # XXX relative roots currently don't work if the root is within a
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1091 # subrepo
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1092 uirelroot = match.uipath(relroot)
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1093 relroot += '/'
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1094 for matchroot in match.files():
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1095 if not matchroot.startswith(relroot):
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1096 ui.warn(_('warning: %s not inside relative root %s\n') % (
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1097 match.uipath(matchroot), uirelroot))
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1098
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1099 if stat:
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1100 diffopts = diffopts.copy(context=0)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1101 width = 80
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1102 if not ui.plain():
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12619 diff changeset	1103 width = ui.termwidth()
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1104 chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
24431 a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1105 prefix=prefix, relroot=relroot)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1106 for chunk, label in patch.diffstatui(util.iterlines(chunks),
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1107 width=width,
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1108 git=diffopts.git):
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1109 write(chunk, label=label)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1110 else:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1111 for chunk, label in patch.diffui(repo, node1, node2, match,
24431 a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1112 changes, diffopts, prefix=prefix,
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1113 relroot=relroot):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1114 write(chunk, label=label)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1115
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1116 if listsubrepos:
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1117 ctx1 = repo[node1]
12175 c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	1118 ctx2 = repo[node2]
20392 d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	1119 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
15698 43e068c15619 diff: when diffing a revision with a deleted subrepo, maintain the node context (issue3153) Alistair Bell <alistair.bell@netronome.com> parents: 15634 diff changeset	1120 tempnode2 = node2
15634 cfc15cbecc5e diff: don't crash when diffing a revision with a deleted subrepo (issue3153) Renato Cunha <renato@renatocunha.com> parents: 15600 diff changeset	1121 try:
cfc15cbecc5e diff: don't crash when diffing a revision with a deleted subrepo (issue3153) Renato Cunha <renato@renatocunha.com> parents: 15600 diff changeset	1122 if node2 is not None:
15698 43e068c15619 diff: when diffing a revision with a deleted subrepo, maintain the node context (issue3153) Alistair Bell <alistair.bell@netronome.com> parents: 15634 diff changeset	1123 tempnode2 = ctx2.substate[subpath][1]
15634 cfc15cbecc5e diff: don't crash when diffing a revision with a deleted subrepo (issue3153) Renato Cunha <renato@renatocunha.com> parents: 15600 diff changeset	1124 except KeyError:
cfc15cbecc5e diff: don't crash when diffing a revision with a deleted subrepo (issue3153) Renato Cunha <renato@renatocunha.com> parents: 15600 diff changeset	1125 # A subrepo that existed in node1 was deleted between node1 and
cfc15cbecc5e diff: don't crash when diffing a revision with a deleted subrepo (issue3153) Renato Cunha <renato@renatocunha.com> parents: 15600 diff changeset	1126 # node2 (inclusive). Thus, ctx2's substate won't contain that
cfc15cbecc5e diff: don't crash when diffing a revision with a deleted subrepo (issue3153) Renato Cunha <renato@renatocunha.com> parents: 15600 diff changeset	1127 # subpath. The best we can do is to ignore it.
15698 43e068c15619 diff: when diffing a revision with a deleted subrepo, maintain the node context (issue3153) Alistair Bell <alistair.bell@netronome.com> parents: 15634 diff changeset	1128 tempnode2 = None
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1129 submatch = matchmod.narrowmatcher(subpath, match)
18006 0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17924 diff changeset	1130 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1131 stat=stat, fp=fp, prefix=prefix)
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1132
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1133 class changeset_printer(object):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1134 '''show changeset information when templating not requested.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1135
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1136 def __init__(self, ui, repo, matchfn, diffopts, buffered):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1137 self.ui = ui
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1138 self.repo = repo
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1139 self.buffered = buffered
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1140 self.matchfn = matchfn
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	1141 self.diffopts = diffopts
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1142 self.header = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1143 self.hunk = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1144 self.lastheader = None
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1145 self.footer = None
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1146
25763 60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	1147 def flush(self, ctx):
60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	1148 rev = ctx.rev()
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1149 if rev in self.header:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1150 h = self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1151 if h != self.lastheader:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1152 self.lastheader = h
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1153 self.ui.write(h)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1154 del self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1155 if rev in self.hunk:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1156 self.ui.write(self.hunk[rev])
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1157 del self.hunk[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1158 return 1
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1159 return 0
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1160
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1161 def close(self):
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1162 if self.footer:
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1163 self.ui.write(self.footer)
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1164
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1165 def show(self, ctx, copies=None, matchfn=None, **props):
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1166 if self.buffered:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1167 self.ui.pushbuffer()
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1168 self._show(ctx, copies, matchfn, props)
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1169 self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1170 else:
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1171 self._show(ctx, copies, matchfn, props)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1172
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1173 def _show(self, ctx, copies, matchfn, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1174 '''show a single changeset or file revision'''
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	1175 changenode = ctx.node()
87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	1176 rev = ctx.rev()
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1177 if self.ui.debugflag:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1178 hexfunc = hex
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1179 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1180 hexfunc = short
25762 f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25759 diff changeset	1181 # as of now, wctx.node() and wctx.rev() return None, but we want to
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25759 diff changeset	1182 # show the same values as {node} and {rev} templatekw
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25759 diff changeset	1183 revnode = (scmutil.intrev(rev), hexfunc(bin(ctx.hex())))
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1184
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1185 if self.ui.quiet:
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1186 self.ui.write("%d:%s\n" % revnode, label='log.node')
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1187 return
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1188
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1189 date = util.datestr(ctx.date())
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1190
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1191 # i18n: column positioning for "hg log"
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1192 self.ui.write(_("changeset: %d:%s\n") % revnode,
17788 9912baaae7df color: add additional changeset.phase label to log.changeset and log.parent Sean Farley <sean.michael.farley@gmail.com> parents: 17746 diff changeset	1193 label='log.changeset changeset.%s' % ctx.phasestr())
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1194
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1195 # branches are shown first before any other names due to backwards
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1196 # compatibility
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	1197 branch = ctx.branch()
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	1198 # don't show the default branch name
f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	1199 if branch != 'default':
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1200 # i18n: column positioning for "hg log"
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1201 self.ui.write(_("branch: %s\n") % branch,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1202 label='log.branch')
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1203
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1204 for name, ns in self.repo.names.iteritems():
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1205 # branches has special logic already handled above, so here we just
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1206 # skip it
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1207 if name == 'branches':
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1208 continue
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1209 # we will use the templatename as the color name since those two
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1210 # should be the same
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1211 for name in ns.names(self.repo, changenode):
23967 448bb32b8ee6 namespace: introduce logfmt to show l10n-ed messages for hg log correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23965 diff changeset	1212 self.ui.write(ns.logfmt % name,
448bb32b8ee6 namespace: introduce logfmt to show l10n-ed messages for hg log correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23965 diff changeset	1213 label='log.%s' % ns.colorname)
22765 55dcc7fb731c log: do not hide the public phase in debug mode (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22764 diff changeset	1214 if self.ui.debugflag:
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1215 # i18n: column positioning for "hg log"
24864 bff42a92012e cmdutil: avoid wrapping ctx.phasestr() by _() FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24857 diff changeset	1216 self.ui.write(_("phase: %s\n") % ctx.phasestr(),
15907 51fc43253a52 changeset_printer: display changeset phase on debug level Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15777 diff changeset	1217 label='log.phase')
26433 3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26426 diff changeset	1218 for pctx in scmutil.meaningfulparents(self.repo, ctx):
24483 870d2eb82f6d changeset_printer: use context objects consistently to show parents Yuya Nishihara <yuya@tcha.org> parents: 24480 diff changeset	1219 label = 'log.parent changeset.%s' % pctx.phasestr()
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1220 # i18n: column positioning for "hg log"
24483 870d2eb82f6d changeset_printer: use context objects consistently to show parents Yuya Nishihara <yuya@tcha.org> parents: 24480 diff changeset	1221 self.ui.write(_("parent: %d:%s\n")
870d2eb82f6d changeset_printer: use context objects consistently to show parents Yuya Nishihara <yuya@tcha.org> parents: 24480 diff changeset	1222 % (pctx.rev(), hexfunc(pctx.node())),
22301 f6371cc62d2a log: use correct phase info for parent field (issue4347) Sean Farley <sean.michael.farley@gmail.com> parents: 22167 diff changeset	1223 label=label)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1224
24585 e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	1225 if self.ui.debugflag and rev is not None:
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	1226 mnode = ctx.manifestnode()
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1227 # i18n: column positioning for "hg log"
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1228 self.ui.write(_("manifest: %d:%s\n") %
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1229 (self.repo.manifest.rev(mnode), hex(mnode)),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1230 label='ui.debug log.manifest')
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1231 # i18n: column positioning for "hg log"
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1232 self.ui.write(_("user: %s\n") % ctx.user(),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1233 label='log.user')
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1234 # i18n: column positioning for "hg log"
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1235 self.ui.write(_("date: %s\n") % date,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1236 label='log.date')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1237
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1238 if self.ui.debugflag:
24485 914caae9a86a changeset_printer: use changectx to get status tuple Yuya Nishihara <yuya@tcha.org> parents: 24484 diff changeset	1239 files = ctx.p1().status(ctx)[:3]
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1240 for key, value in zip([# i18n: column positioning for "hg log"
8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1241 _("files:"),
8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1242 # i18n: column positioning for "hg log"
8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1243 _("files+:"),
8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1244 # i18n: column positioning for "hg log"
8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1245 _("files-:")], files):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1246 if value:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1247 self.ui.write("%-12s %s\n" % (key, " ".join(value)),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1248 label='ui.debug log.files')
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	1249 elif ctx.files() and self.ui.verbose:
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1250 # i18n: column positioning for "hg log"
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1251 self.ui.write(_("files: %s\n") % " ".join(ctx.files()),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1252 label='ui.note log.files')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1253 if copies and self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1254 copies = ['%s (%s)' % c for c in copies]
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1255 # i18n: column positioning for "hg log"
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1256 self.ui.write(_("copies: %s\n") % ' '.join(copies),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1257 label='ui.note log.copies')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1258
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	1259 extra = ctx.extra()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1260 if extra and self.ui.debugflag:
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1261 for key, value in sorted(extra.items()):
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1262 # i18n: column positioning for "hg log"
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1263 self.ui.write(_("extra: %s=%s\n")
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1264 % (key, value.encode('string_escape')),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1265 label='ui.debug log.extra')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1266
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	1267 description = ctx.description().strip()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1268 if description:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1269 if self.ui.verbose:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1270 self.ui.write(_("description:\n"),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1271 label='ui.note log.description')
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1272 self.ui.write(description,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1273 label='ui.note log.description')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1274 self.ui.write("\n\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1275 else:
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1276 # i18n: column positioning for "hg log"
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1277 self.ui.write(_("summary: %s\n") %
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1278 description.splitlines()[0],
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1279 label='log.summary')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1280 self.ui.write("\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1281
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1282 self.showpatch(changenode, matchfn)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1283
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1284 def showpatch(self, node, matchfn):
f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1285 if not matchfn:
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1286 matchfn = self.matchfn
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1287 if matchfn:
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11059 diff changeset	1288 stat = self.diffopts.get('stat')
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1289 diff = self.diffopts.get('patch')
23691 e41bcb019633 cmdutil.changeset_printer: explicitly honor all diffopts Siddharth Agarwal <sid0@fb.com> parents: 23686 diff changeset	1290 diffopts = patch.diffallopts(self.ui, self.diffopts)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1291 prev = self.repo.changelog.parents(node)[0]
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1292 if stat:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1293 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1294 match=matchfn, stat=True)
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1295 if diff:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1296 if stat:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1297 self.ui.write("\n")
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1298 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1299 match=matchfn, stat=False)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1300 self.ui.write("\n")
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1301
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1302 class jsonchangeset(changeset_printer):
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1303 '''format changeset information.'''
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1304
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1305 def __init__(self, ui, repo, matchfn, diffopts, buffered):
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1306 changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1307 self.cache = {}
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1308 self._first = True
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1309
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1310 def close(self):
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1311 if not self._first:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1312 self.ui.write("\n]\n")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1313 else:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1314 self.ui.write("[]\n")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1315
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1316 def _show(self, ctx, copies, matchfn, props):
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1317 '''show a single changeset or file revision'''
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1318 rev = ctx.rev()
24602 201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1319 if rev is None:
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1320 jrev = jnode = 'null'
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1321 else:
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1322 jrev = str(rev)
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1323 jnode = '"%s"' % hex(ctx.node())
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1324 j = encoding.jsonescape
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1325
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1326 if self._first:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1327 self.ui.write("[\n {")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1328 self._first = False
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1329 else:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1330 self.ui.write(",\n {")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1331
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1332 if self.ui.quiet:
24602 201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1333 self.ui.write('\n "rev": %s' % jrev)
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1334 self.ui.write(',\n "node": %s' % jnode)
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1335 self.ui.write('\n }')
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1336 return
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1337
24602 201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1338 self.ui.write('\n "rev": %s' % jrev)
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1339 self.ui.write(',\n "node": %s' % jnode)
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1340 self.ui.write(',\n "branch": "%s"' % j(ctx.branch()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1341 self.ui.write(',\n "phase": "%s"' % ctx.phasestr())
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1342 self.ui.write(',\n "user": "%s"' % j(ctx.user()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1343 self.ui.write(',\n "date": [%d, %d]' % ctx.date())
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1344 self.ui.write(',\n "desc": "%s"' % j(ctx.description()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1345
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1346 self.ui.write(',\n "bookmarks": [%s]' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1347 ", ".join('"%s"' % j(b) for b in ctx.bookmarks()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1348 self.ui.write(',\n "tags": [%s]' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1349 ", ".join('"%s"' % j(t) for t in ctx.tags()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1350 self.ui.write(',\n "parents": [%s]' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1351 ", ".join('"%s"' % c.hex() for c in ctx.parents()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1352
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1353 if self.ui.debugflag:
24603 e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1354 if rev is None:
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1355 jmanifestnode = 'null'
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1356 else:
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1357 jmanifestnode = '"%s"' % hex(ctx.manifestnode())
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1358 self.ui.write(',\n "manifest": %s' % jmanifestnode)
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1359
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1360 self.ui.write(',\n "extra": {%s}' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1361 ", ".join('"%s": "%s"' % (j(k), j(v))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1362 for k, v in ctx.extra().items()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1363
23734 f4e6475950f1 cmdutil.jsonchangeset: properly compute added and removed files Gregory Szorc <gregory.szorc@gmail.com> parents: 23501 diff changeset	1364 files = ctx.p1().status(ctx)
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1365 self.ui.write(',\n "modified": [%s]' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1366 ", ".join('"%s"' % j(f) for f in files[0]))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1367 self.ui.write(',\n "added": [%s]' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1368 ", ".join('"%s"' % j(f) for f in files[1]))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1369 self.ui.write(',\n "removed": [%s]' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1370 ", ".join('"%s"' % j(f) for f in files[2]))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1371
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1372 elif self.ui.verbose:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1373 self.ui.write(',\n "files": [%s]' %
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1374 ", ".join('"%s"' % j(f) for f in ctx.files()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1375
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1376 if copies:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1377 self.ui.write(',\n "copies": {%s}' %
24013 942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23967 diff changeset	1378 ", ".join('"%s": "%s"' % (j(k), j(v))
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23967 diff changeset	1379 for k, v in copies))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1380
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1381 matchfn = self.matchfn
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1382 if matchfn:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1383 stat = self.diffopts.get('stat')
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1384 diff = self.diffopts.get('patch')
23453 341e4798c24d jsonchangeset: don't honor whitespace and format-changing diffopts Siddharth Agarwal <sid0@fb.com> parents: 23404 diff changeset	1385 diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1386 node, prev = ctx.node(), ctx.p1().node()
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1387 if stat:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1388 self.ui.pushbuffer()
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1389 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1390 match=matchfn, stat=True)
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1391 self.ui.write(',\n "diffstat": "%s"' % j(self.ui.popbuffer()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1392 if diff:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1393 self.ui.pushbuffer()
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1394 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1395 match=matchfn, stat=False)
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1396 self.ui.write(',\n "diff": "%s"' % j(self.ui.popbuffer()))
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1397
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1398 self.ui.write("\n }")
4825 3cf94964c56b hg log: Move filtering implicit parents to own method and use it in templater. Thomas Arendsen Hein <thomas@intevation.de> parents: 4824 diff changeset	1399
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1400 class changeset_templater(changeset_printer):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1401 '''format changeset information.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1402
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1403 def __init__(self, ui, repo, matchfn, diffopts, tmpl, mapfile, buffered):
54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1404 changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	1405 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
10061 9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1406 defaulttempl = {
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1407 'parent': '{rev}:{node\|formatnode} ',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1408 'manifest': '{rev}:{node\|formatnode}',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1409 'file_copy': '{name} ({source})',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1410 'extra': '{key}={value\|stringescape}'
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1411 }
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1412 # filecopy is preserved for compatibility reasons
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1413 defaulttempl['filecopy'] = defaulttempl['file_copy']
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	1414 self.t = templater.templater(mapfile, {'formatnode': formatnode},
10061 9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	1415 cache=defaulttempl)
20667 e96e9f805c19 changeset_templater: remove use_template method Matt Mackall <mpm@selenic.com> parents: 20666 diff changeset	1416 if tmpl:
e96e9f805c19 changeset_templater: remove use_template method Matt Mackall <mpm@selenic.com> parents: 20666 diff changeset	1417 self.t.cache['changeset'] = tmpl
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1418
20667 e96e9f805c19 changeset_templater: remove use_template method Matt Mackall <mpm@selenic.com> parents: 20666 diff changeset	1419 self.cache = {}
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1420
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1421 # find correct templates for current mode
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1422 tmplmodes = [
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1423 (True, None),
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1424 (self.ui.verbose, 'verbose'),
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1425 (self.ui.quiet, 'quiet'),
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1426 (self.ui.debugflag, 'debug'),
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1427 ]
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1428
26222 3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1429 self._parts = {'header': '', 'footer': '', 'changeset': 'changeset',
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1430 'docheader': '', 'docfooter': ''}
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1431 for mode, postfix in tmplmodes:
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1432 for t in self._parts:
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1433 cur = t
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1434 if postfix:
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1435 cur += "_" + postfix
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1436 if mode and cur in self.t:
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1437 self._parts[t] = cur
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1438
26222 3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1439 if self._parts['docheader']:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1440 self.ui.write(templater.stringify(self.t(self._parts['docheader'])))
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1441
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1442 def close(self):
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1443 if self._parts['docfooter']:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1444 if not self.footer:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1445 self.footer = ""
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1446 self.footer += templater.stringify(self.t(self._parts['docfooter']))
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1447 return super(changeset_templater, self).close()
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1448
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1449 def _show(self, ctx, copies, matchfn, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1450 '''show a single changeset or file revision'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1451 props = props.copy()
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	1452 props.update(templatekw.keywords)
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	1453 props['templ'] = self.t
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	1454 props['ctx'] = ctx
10055 e400a511e63a cmdutil: extract repo dependent closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10054 diff changeset	1455 props['repo'] = self.repo
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	1456 props['revcache'] = {'copies': copies}
10057 babc00a82c5e cmdutil: extract latest tags closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10056 diff changeset	1457 props['cache'] = self.cache
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1458
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1459 try:
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	1460 # write header
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1461 if self._parts['header']:
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1462 h = templater.stringify(self.t(self._parts['header'], **props))
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1463 if self.buffered:
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	1464 self.header[ctx.rev()] = h
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1465 else:
11465 ace5bd98bee3 heads: fix templating of headers again (issue2130) Simon Howkins <simonh@symbian.org> parents: 11441 diff changeset	1466 if self.lastheader != h:
ace5bd98bee3 heads: fix templating of headers again (issue2130) Simon Howkins <simonh@symbian.org> parents: 11441 diff changeset	1467 self.lastheader = h
11441 d74fe370ab04 cmdutil: only output style header once in non-buffered mode (issue2130) Simon Howkins <simonh@symbian.org> parents: 11410 diff changeset	1468 self.ui.write(h)
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	1469
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	1470 # write changeset metadata, then patch if requested
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1471 key = self._parts['changeset']
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1472 self.ui.write(templater.stringify(self.t(key, **props)))
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1473 self.showpatch(ctx.node(), matchfn)
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	1474
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1475 if self._parts['footer']:
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1476 if not self.footer:
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1477 self.footer = templater.stringify(
3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1478 self.t(self._parts['footer'], **props))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	1479 except KeyError as inst:
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	1480 msg = _("%s: no key named '%s'")
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	1481 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	1482 except SyntaxError as inst:
10829 56fffc9c8928 cmdutil: do not translate trivial string Martin Geisler <mg@lazybytes.net> parents: 10819 diff changeset	1483 raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0]))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1484
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1485 def gettemplate(ui, tmpl, style):
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1486 """
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1487 Find the template matching the given template spec or style.
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1488 """
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1489
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1490 # ui settings
22582 4fe5fa49eac8 templater: fix precedence of --style and --template options Yuya Nishihara <yuya@tcha.org> parents: 22303 diff changeset	1491 if not tmpl and not style: # template are stronger than style
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1492 tmpl = ui.config('ui', 'logtemplate')
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1493 if tmpl:
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1494 try:
24988 e8ff0b09acac templater: rename parsestring() to unquotestring() (API) Yuya Nishihara <yuya@tcha.org> parents: 24987 diff changeset	1495 tmpl = templater.unquotestring(tmpl)
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1496 except SyntaxError:
24987 fd7287f0b43c templater: remove noop calls of parsestring(s, quoted=False) (API) Yuya Nishihara <yuya@tcha.org> parents: 24986 diff changeset	1497 pass
20668 3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	1498 return tmpl, None
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1499 else:
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1500 style = util.expandpath(ui.config('ui', 'style', ''))
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1501
22582 4fe5fa49eac8 templater: fix precedence of --style and --template options Yuya Nishihara <yuya@tcha.org> parents: 22303 diff changeset	1502 if not tmpl and style:
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1503 mapfile = style
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1504 if not os.path.split(mapfile)[0]:
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1505 mapname = (templater.templatepath('map-cmdline.' + mapfile)
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1506 or templater.templatepath(mapfile))
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1507 if mapname:
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1508 mapfile = mapname
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1509 return None, mapfile
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1510
20668 3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	1511 if not tmpl:
3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	1512 return None, None
3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	1513
25511 c2a4dfe2a336 formatter: move most of template option helper to formatter Matt Mackall <mpm@selenic.com> parents: 25439 diff changeset	1514 return formatter.lookuptemplate(ui, 'changeset', tmpl)
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1515
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1516 def show_changeset(ui, repo, opts, buffered=False):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1517 """show one changeset using template or regular display.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1518
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1519 Display format will be the first non-empty hit of:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1520 1. option 'template'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1521 2. option 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1522 3. [ui] setting 'logtemplate'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1523 4. [ui] setting 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1524 If all of these values are either the unset or the empty string,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1525 regular display via changeset_printer() is done.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1526 """
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1527 # options
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1528 matchfn = None
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11059 diff changeset	1529 if opts.get('patch') or opts.get('stat'):
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1530 matchfn = scmutil.matchall(repo)
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	1531
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1532 if opts.get('template') == 'json':
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1533 return jsonchangeset(ui, repo, matchfn, opts, buffered)
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	1534
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1535 tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style'))
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1536
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1537 if not tmpl and not mapfile:
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1538 return changeset_printer(ui, repo, matchfn, opts, buffered)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1539
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1540 try:
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1541 t = changeset_templater(ui, repo, matchfn, opts, tmpl, mapfile,
54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1542 buffered)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	1543 except SyntaxError as inst:
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1544 raise util.Abort(inst.args[0])
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1545 return t
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1546
20470 78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1547 def showmarker(ui, marker):
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1548 """utility function to display obsolescence marker in a readable way
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1549
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1550 To be used by debug function."""
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1551 ui.write(hex(marker.precnode()))
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1552 for repl in marker.succnodes():
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1553 ui.write(' ')
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1554 ui.write(hex(repl))
22215 525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22213 diff changeset	1555 ui.write(' %X ' % marker.flags())
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22250 diff changeset	1556 parents = marker.parentnodes()
2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22250 diff changeset	1557 if parents is not None:
2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22250 diff changeset	1558 ui.write('{%s} ' % ', '.join(hex(p) for p in parents))
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 22215 diff changeset	1559 ui.write('(%s) ' % util.datestr(marker.date()))
20470 78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1560 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 22215 diff changeset	1561 sorted(marker.metadata().items())
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 22215 diff changeset	1562 if t[0] != 'date')))
20470 78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1563 ui.write('\n')
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	1564
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1565 def finddate(ui, repo, date):
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1566 """Find the tipmost changeset that matches the given date spec"""
9667 8743f2e1bc54 merge changes from mpm Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9666 9665 diff changeset	1567
5836 c5c9a022bd9a Tweak finddate to pass date directly. mark.williamson@cl.cam.ac.uk parents: 5829 diff changeset	1568 df = util.matchdate(date)
14322 a90131b85fd8 scmutil: drop aliases in cmdutil for match functions Matt Mackall <mpm@selenic.com> parents: 14321 diff changeset	1569 m = scmutil.matchall(repo)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1570 results = {}
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1571
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1572 def prep(ctx, fns):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1573 d = ctx.date()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1574 if df(d[0]):
9668 2c24471d478c cmdutil: fix bug in finddate() implementation Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9667 diff changeset	1575 results[ctx.rev()] = d
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1576
9667 8743f2e1bc54 merge changes from mpm Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9666 9665 diff changeset	1577 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1578 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1579 if rev in results:
16937 5487088f0d43 cmdutil: lowercase finddate status message Martin Geisler <mg@aragost.com> parents: 16776 diff changeset	1580 ui.status(_("found revision %s from %s\n") %
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1581 (rev, util.datestr(results[rev])))
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1582 return str(rev)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1583
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1584 raise util.Abort(_("revision matching date not found"))
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1585
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1586 def increasingwindows(windowsize=8, sizelimit=512):
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1587 while True:
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1588 yield windowsize
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1589 if windowsize < sizelimit:
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1590 windowsize *= 2
16776 5088d0b9a9a1 cmdutil: extract increasing_windows() from walkchangerevs() Patrick Mezard <patrick@mezard.eu> parents: 16701 diff changeset	1591
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1592 class FileWalkError(Exception):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1593 pass
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1594
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1595 def walkfilerevs(repo, match, follow, revs, fncache):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1596 '''Walks the file history for the matched files.
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1597
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1598 Returns the changeset revs that are involved in the file history.
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1599
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1600 Throws FileWalkError if the file history can't be walked using
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1601 filelogs alone.
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1602 '''
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1603 wanted = set()
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1604 copies = []
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1605 minrev, maxrev = min(revs), max(revs)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1606 def filerevgen(filelog, last):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1607 """
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1608 Only files, no patterns. Check the history of each file.
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1609
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1610 Examines filelog entries within minrev, maxrev linkrev range
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1611 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1612 tuples in backwards order
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1613 """
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1614 cl_count = len(repo)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1615 revs = []
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1616 for j in xrange(0, last + 1):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1617 linkrev = filelog.linkrev(j)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1618 if linkrev < minrev:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1619 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1620 # only yield rev for which we have the changelog, it can
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1621 # happen while doing "hg log" during a pull or commit
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1622 if linkrev >= cl_count:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1623 break
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1624
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1625 parentlinkrevs = []
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1626 for p in filelog.parentrevs(j):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1627 if p != nullrev:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1628 parentlinkrevs.append(filelog.linkrev(p))
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1629 n = filelog.node(j)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1630 revs.append((linkrev, parentlinkrevs,
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1631 follow and filelog.renamed(n)))
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1632
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1633 return reversed(revs)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1634 def iterfiles():
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1635 pctx = repo['.']
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1636 for filename in match.files():
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1637 if follow:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1638 if filename not in pctx:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1639 raise util.Abort(_('cannot follow file not in parent '
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1640 'revision: "%s"') % filename)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1641 yield filename, pctx[filename].filenode()
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1642 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1643 yield filename, None
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1644 for filename_node in copies:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1645 yield filename_node
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1646
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1647 for file_, node in iterfiles():
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1648 filelog = repo.file(file_)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1649 if not len(filelog):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1650 if node is None:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1651 # A zero count may be a directory or deleted file, so
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1652 # try to find matching entries on the slow path.
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1653 if follow:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1654 raise util.Abort(
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1655 _('cannot follow nonexistent file: "%s"') % file_)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1656 raise FileWalkError("Cannot walk via filelog")
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1657 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1658 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1659
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1660 if node is None:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1661 last = len(filelog) - 1
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1662 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1663 last = filelog.rev(node)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1664
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1665 # keep track of all ancestors of the file
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1666 ancestors = set([filelog.linkrev(last)])
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1667
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1668 # iterate from latest to oldest revision
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1669 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1670 if not follow:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1671 if rev > maxrev:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1672 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1673 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1674 # Note that last might not be the first interesting
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1675 # rev to us:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1676 # if the file has been changed after maxrev, we'll
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1677 # have linkrev(last) > maxrev, and we still need
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1678 # to explore the file graph
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1679 if rev not in ancestors:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1680 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1681 # XXX insert 1327 fix here
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1682 if flparentlinkrevs:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1683 ancestors.update(flparentlinkrevs)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1684
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1685 fncache.setdefault(rev, []).append(file_)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1686 wanted.add(rev)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1687 if copied:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1688 copies.append(copied)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1689
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1690 return wanted
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1691
24391 6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1692 class _followfilter(object):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1693 def __init__(self, repo, onlyfirst=False):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1694 self.repo = repo
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1695 self.startrev = nullrev
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1696 self.roots = set()
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1697 self.onlyfirst = onlyfirst
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1698
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1699 def match(self, rev):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1700 def realparents(rev):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1701 if self.onlyfirst:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1702 return self.repo.changelog.parentrevs(rev)[0:1]
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1703 else:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1704 return filter(lambda x: x != nullrev,
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1705 self.repo.changelog.parentrevs(rev))
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1706
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1707 if self.startrev == nullrev:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1708 self.startrev = rev
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1709 return True
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1710
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1711 if rev > self.startrev:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1712 # forward: all descendants
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1713 if not self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1714 self.roots.add(self.startrev)
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1715 for parent in realparents(rev):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1716 if parent in self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1717 self.roots.add(rev)
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1718 return True
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1719 else:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1720 # backwards: all parents
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1721 if not self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1722 self.roots.update(realparents(self.startrev))
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1723 if rev in self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1724 self.roots.remove(rev)
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1725 self.roots.update(realparents(rev))
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1726 return True
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1727
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1728 return False
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1729
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	1730 def walkchangerevs(repo, match, opts, prepare):
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	1731 '''Iterate over files and the revs in which they changed.
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1732
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1733 Callers most commonly need to iterate backwards over the history
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	1734 in which they are interested. Doing so has awful (quadratic-looking)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1735 performance, so we use iterators in a "windowed" way.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1736
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1737 We walk a window of revisions in the desired order. Within the
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1738 window, we first walk forwards to gather data, then in the desired
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1739 order (usually backwards) to display it.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1740
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1741 This function returns an iterator yielding contexts. Before
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1742 yielding each context, the iterator will first call the prepare
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1743 function on each context in the window in forward order.'''
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1744
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1745 follow = opts.get('follow') or opts.get('follow_first')
24063 c98fa0ca4678 cmdutil: have walkchangerevs utilize common function to build revs Yuya Nishihara <yuya@tcha.org> parents: 24062 diff changeset	1746 revs = _logrevs(repo, opts)
11281 b724b8467b82 walkchangerevs: allow empty query sets Matt Mackall <mpm@selenic.com> parents: 11277 diff changeset	1747 if not revs:
b724b8467b82 walkchangerevs: allow empty query sets Matt Mackall <mpm@selenic.com> parents: 11277 diff changeset	1748 return []
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1749 wanted = set()
25272 6c76c42a5893 walkchangerevs: avoid match.files() in conditions Martin von Zweigbergk <martinvonz@google.com> parents: 25271 diff changeset	1750 slowpath = match.anypats() or ((match.isexact() or match.prefix()) and
6c76c42a5893 walkchangerevs: avoid match.files() in conditions Martin von Zweigbergk <martinvonz@google.com> parents: 25271 diff changeset	1751 opts.get('removed'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1752 fncache = {}
16108 f7e0d95d0a0b log: remove caching of all visited revisions (issue3253) Matt Mackall <mpm@selenic.com> parents: 16070 diff changeset	1753 change = repo.changectx
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1754
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1755 # First step is to fill wanted, the set of revisions that we want to yield.
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1756 # When it does not induce extra cost, we also fill fncache for revisions in
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1757 # wanted: a cache of filenames that were changed (ctx.files()) and that
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1758 # match the file filtering conditions.
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1759
24384 5cb459dc32d2 walkchangerevs: simplify by using match.always() method Martin von Zweigbergk <martinvonz@google.com> parents: 24379 diff changeset	1760 if match.always():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1761 # No files, no patterns. Display all revs.
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1762 wanted = revs
25271 1b1eaf1885df walkchangerevs: simplify with an 'elif' Martin von Zweigbergk <martinvonz@google.com> parents: 25259 diff changeset	1763 elif not slowpath:
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1764 # We only have to read through the filelog to find wanted revisions
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1765
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1766 try:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1767 wanted = walkfilerevs(repo, match, follow, revs, fncache)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1768 except FileWalkError:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1769 slowpath = True
11608 183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1770
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1771 # We decided to fall back to the slowpath because at least one
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1772 # of the paths was not a file. Check to see if at least one of them
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	1773 # existed in history, otherwise simply return
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1774 for path in match.files():
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1775 if path == '.' or path in repo.store:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1776 break
18340 8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	1777 else:
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	1778 return []
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1779
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1780 if slowpath:
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1781 # We have to read the changelog to match filenames against
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1782 # changed files
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1783
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1784 if follow:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1785 raise util.Abort(_('can only follow copies/renames for explicit '
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8731 diff changeset	1786 'filenames'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1787
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1788 # The slow path checks files modified in every changeset.
19730 d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1789 # This is really slow on large repos, so compute the set lazily.
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1790 class lazywantedset(object):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1791 def __init__(self):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1792 self.set = set()
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1793 self.revs = set(revs)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1794
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1795 # No need to worry about locality here because it will be accessed
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1796 # in the same order as the increasing window below.
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1797 def __contains__(self, value):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1798 if value in self.set:
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1799 return True
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1800 elif not value in self.revs:
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1801 return False
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1802 else:
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1803 self.revs.discard(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1804 ctx = change(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1805 matches = filter(match, ctx.files())
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1806 if matches:
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1807 fncache[value] = matches
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1808 self.set.add(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1809 return True
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1810 return False
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1811
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1812 def discard(self, value):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1813 self.revs.discard(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1814 self.set.discard(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1815
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	1816 wanted = lazywantedset()
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1817
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1818 # it might be worthwhile to do this in the iterator if the rev range
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1819 # is descending and the prune args are all within that range
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1820 for rev in opts.get('prune', ()):
16380 84ba30e8c790 cmdutil: use context instead of lookup Matt Mackall <mpm@selenic.com> parents: 16304 diff changeset	1821 rev = repo[rev].rev()
24391 6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1822 ff = _followfilter(repo)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1823 stop = min(revs[0], revs[-1])
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1824 for x in xrange(rev, stop - 1, -1):
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1825 if ff.match(x):
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1826 wanted = wanted - [x]
18710 49ef9d0ca815 cmdutil: use a small initial window with --limit Bryan O'Sullivan <bryano@fb.com> parents: 18688 diff changeset	1827
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1828 # Now that wanted is correctly initialized, we can iterate over the
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1829 # revision range, yielding only revisions in wanted.
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1830 def iterate():
25272 6c76c42a5893 walkchangerevs: avoid match.files() in conditions Martin von Zweigbergk <martinvonz@google.com> parents: 25271 diff changeset	1831 if follow and match.always():
24391 6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	1832 ff = _followfilter(repo, onlyfirst=opts.get('follow_first'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1833 def want(rev):
8119 af44d0b953c6 cmdutil: return boolean result directly in want function Martin Geisler <mg@lazybytes.net> parents: 8117 diff changeset	1834 return ff.match(rev) and rev in wanted
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1835 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1836 def want(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1837 return rev in wanted
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1838
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1839 it = iter(revs)
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1840 stopiteration = False
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1841 for windowsize in increasingwindows():
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1842 nrevs = []
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1843 for i in xrange(windowsize):
25147 fb7b9a765bb9 walkchangerevs: replace try/except with 'next' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25119 diff changeset	1844 rev = next(it, None)
fb7b9a765bb9 walkchangerevs: replace try/except with 'next' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25119 diff changeset	1845 if rev is None:
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1846 stopiteration = True
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1847 break
25147 fb7b9a765bb9 walkchangerevs: replace try/except with 'next' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25119 diff changeset	1848 elif want(rev):
fb7b9a765bb9 walkchangerevs: replace try/except with 'next' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25119 diff changeset	1849 nrevs.append(rev)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1850 for rev in sorted(nrevs):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1851 fns = fncache.get(rev)
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	1852 ctx = change(rev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1853 if not fns:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1854 def fns_generator():
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	1855 for f in ctx.files():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1856 if match(f):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1857 yield f
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1858 fns = fns_generator()
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1859 prepare(ctx, fns)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1860 for rev in nrevs:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1861 yield change(rev)
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1862
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1863 if stopiteration:
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1864 break
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	1865
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1866 return iterate()
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1867
22166 ac7a3b2a85e3 cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher Siddharth Agarwal <sid0@fb.com> parents: 21966 diff changeset	1868 def _makefollowlogfilematcher(repo, files, followfirst):
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1869 # When displaying a revision with --patch --follow FILE, we have
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1870 # to know which file of the revision must be diffed. With
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1871 # --follow, we want the names of the ancestors of FILE in the
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1872 # revision, stored in "fcache". "fcache" is populated by
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1873 # reproducing the graph traversal already done by --follow revset
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1874 # and relating linkrevs to file names (which is not "correct" but
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1875 # good enough).
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1876 fcache = {}
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1877 fcacheready = [False]
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1878 pctx = repo['.']
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1879
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1880 def populate():
21876 584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 21825 diff changeset	1881 for fn in files:
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1882 for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1883 for c in i:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1884 fcache.setdefault(c.linkrev(), set()).add(c.path())
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1885
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1886 def filematcher(rev):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1887 if not fcacheready[0]:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1888 # Lazy initialization
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1889 fcacheready[0] = True
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1890 populate()
21878 e2530d4a47c1 log: use an exact matcher for --patch --follow Siddharth Agarwal <sid0@fb.com> parents: 21877 diff changeset	1891 return scmutil.matchfiles(repo, fcache.get(rev, []))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1892
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1893 return filematcher
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1894
22167 d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	1895 def _makenofollowlogfilematcher(repo, pats, opts):
d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	1896 '''hook for extensions to override the filematcher for non-follow cases'''
d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	1897 return None
d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	1898
21108 e5ad36a845af cmdutil: changed _makegraphlogrevset to _makelogrevset Lucas Moscovicz <lmoscovicz@fb.com> parents: 21051 diff changeset	1899 def _makelogrevset(repo, pats, opts, revs):
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1900 """Return (expr, filematcher) where expr is a revset string built
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1901 from log options and file patterns or None. If --stat or --patch
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1902 are not passed filematcher is None. Otherwise it is a callable
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1903 taking a revision number and returning a match objects filtering
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1904 the files to be detailed when displaying the revision.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1905 """
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1906 opt2revset = {
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1907 'no_merges': ('not merge()', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1908 'only_merges': ('merge()', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1909 '_ancestors': ('ancestors(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1910 '_fancestors': ('_firstancestors(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1911 '_descendants': ('descendants(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1912 '_fdescendants': ('_firstdescendants(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1913 '_matchfiles': ('_matchfiles(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1914 'date': ('date(%(val)r)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1915 'branch': ('branch(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1916 '_patslog': ('filelog(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1917 '_patsfollow': ('follow(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1918 '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1919 'keyword': ('keyword(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1920 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1921 'user': ('user(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1922 }
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1923
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1924 opts = dict(opts)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1925 # follow or not follow?
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1926 follow = opts.get('follow') or opts.get('follow_first')
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1927 if opts.get('follow_first'):
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1928 followfirst = 1
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1929 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1930 followfirst = 0
26098 ce26928cbe41 spelling: behaviour -> behavior timeless@mozdev.org parents: 26086 diff changeset	1931 # --follow with FILE behavior depends on revs...
20756 e7833e63bb42 cmdutil: changed code in _makegraphlogrevset not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20755 diff changeset	1932 it = iter(revs)
e7833e63bb42 cmdutil: changed code in _makegraphlogrevset not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20755 diff changeset	1933 startrev = it.next()
25168 4dfd4d3b9b93 _makelogrevset: replace try/except with 'next' usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 25147 diff changeset	1934 followdescendants = startrev < next(it, startrev)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1935
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1936 # branch and only_branch are really aliases and must be handled at
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1937 # the same time
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1938 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1939 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1940 # pats/include/exclude are passed to match.match() directly in
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17391 diff changeset	1941 # _matchfiles() revset but walkchangerevs() builds its matcher with
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1942 # scmutil.match(). The difference is input pats are globbed on
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1943 # platforms without shell expansion (windows).
24534 1925769b4ff8 log: prefer 'wctx' over 'pctx' for working context Martin von Zweigbergk <martinvonz@google.com> parents: 24485 diff changeset	1944 wctx = repo[None]
1925769b4ff8 log: prefer 'wctx' over 'pctx' for working context Martin von Zweigbergk <martinvonz@google.com> parents: 24485 diff changeset	1945 match, pats = scmutil.matchandpats(wctx, pats, opts)
25273 8e0e334bad42 _makelogrevset: avoid match.files() in conditions Martin von Zweigbergk <martinvonz@google.com> parents: 25272 diff changeset	1946 slowpath = match.anypats() or ((match.isexact() or match.prefix()) and
8e0e334bad42 _makelogrevset: avoid match.files() in conditions Martin von Zweigbergk <martinvonz@google.com> parents: 25272 diff changeset	1947 opts.get('removed'))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1948 if not slowpath:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1949 for f in match.files():
24534 1925769b4ff8 log: prefer 'wctx' over 'pctx' for working context Martin von Zweigbergk <martinvonz@google.com> parents: 24485 diff changeset	1950 if follow and f not in wctx:
21998 739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1951 # If the file exists, it may be a directory, so let it
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1952 # take the slow path.
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1953 if os.path.exists(repo.wjoin(f)):
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1954 slowpath = True
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1955 continue
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1956 else:
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1957 raise util.Abort(_('cannot follow file not in parent '
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	1958 'revision: "%s"') % f)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1959 filelog = repo.file(f)
19293 446ab88d3f1c filelog: switch 'not len(filerevlog)' to 'not filerevlog' Durham Goode <durham@fb.com> parents: 19290 diff changeset	1960 if not filelog:
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1961 # A zero count may be a directory or deleted file, so
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1962 # try to find matching entries on the slow path.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1963 if follow:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1964 raise util.Abort(
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1965 _('cannot follow nonexistent file: "%s"') % f)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1966 slowpath = True
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1967
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1968 # We decided to fall back to the slowpath because at least one
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1969 # of the paths was not a file. Check to see if at least one of them
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1970 # existed in history - in that case, we'll continue down the
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1971 # slowpath; otherwise, we can turn off the slowpath
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1972 if slowpath:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1973 for path in match.files():
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1974 if path == '.' or path in repo.store:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1975 break
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1976 else:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1977 slowpath = False
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	1978
23500 9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	1979 fpats = ('_patsfollow', '_patsfollowfirst')
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	1980 fnopats = (('_ancestors', '_fancestors'),
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	1981 ('_descendants', '_fdescendants'))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1982 if slowpath:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1983 # See walkchangerevs() slow path.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1984 #
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1985 # pats/include/exclude cannot be represented as separate
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1986 # revset expressions as their filtering logic applies at file
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1987 # level. For instance "-I a -X a" matches a revision touching
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1988 # "a" and "b" while "file(a) and not file(b)" does
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1989 # not. Besides, filesets are evaluated against the working
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1990 # directory.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1991 matchargs = ['r:', 'd:relpath']
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1992 for p in pats:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1993 matchargs.append('p:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1994 for p in opts.get('include', []):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1995 matchargs.append('i:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1996 for p in opts.get('exclude', []):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1997 matchargs.append('x:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1998 matchargs = ','.join(('%r' % p) for p in matchargs)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	1999 opts['_matchfiles'] = matchargs
23500 9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	2000 if follow:
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	2001 opts[fnopats[0][followfirst]] = '.'
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2002 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2003 if follow:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2004 if pats:
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17391 diff changeset	2005 # follow() revset interprets its file argument as a
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2006 # manifest entry, so use match.files(), not pats.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2007 opts[fpats[followfirst]] = list(match.files())
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2008 else:
23955 8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision Yuya Nishihara <yuya@tcha.org> parents: 23885 diff changeset	2009 op = fnopats[followdescendants][followfirst]
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision Yuya Nishihara <yuya@tcha.org> parents: 23885 diff changeset	2010 opts[op] = 'rev(%d)' % startrev
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2011 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2012 opts['_patslog'] = list(pats)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2013
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2014 filematcher = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2015 if opts.get('patch') or opts.get('stat'):
21998 739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2016 # When following files, track renames via a special matcher.
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2017 # If we're forced to take the slowpath it means we're following
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2018 # at least one pattern/directory, so don't bother with rename tracking.
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2019 if follow and not match.always() and not slowpath:
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23101 diff changeset	2020 # _makefollowlogfilematcher expects its files argument to be
e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23101 diff changeset	2021 # relative to the repo root, so use match.files(), not pats.
22166 ac7a3b2a85e3 cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher Siddharth Agarwal <sid0@fb.com> parents: 21966 diff changeset	2022 filematcher = _makefollowlogfilematcher(repo, match.files(),
ac7a3b2a85e3 cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher Siddharth Agarwal <sid0@fb.com> parents: 21966 diff changeset	2023 followfirst)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2024 else:
22167 d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	2025 filematcher = _makenofollowlogfilematcher(repo, pats, opts)
d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	2026 if filematcher is None:
d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	2027 filematcher = lambda rev: match
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2028
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2029 expr = []
23501 424d669118d3 log: fix log revset instability Durham Goode <durham@fb.com> parents: 23500 diff changeset	2030 for op, val in sorted(opts.iteritems()):
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2031 if not val:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2032 continue
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2033 if op not in opt2revset:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2034 continue
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2035 revop, andor = opt2revset[op]
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2036 if '%(val)' not in revop:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2037 expr.append(revop)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2038 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2039 if not isinstance(val, list):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2040 e = revop % {'val': val}
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2041 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2042 e = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2043 expr.append(e)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2044
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2045 if expr:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2046 expr = '(' + ' and '.join(expr) + ')'
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2047 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2048 expr = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2049 return expr, filematcher
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2050
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2051 def _logrevs(repo, opts):
26098 ce26928cbe41 spelling: behaviour -> behavior timeless@mozdev.org parents: 26086 diff changeset	2052 # Default --rev value depends on --follow but --follow behavior
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2053 # depends on revisions resolved from --rev...
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2054 follow = opts.get('follow') or opts.get('follow_first')
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2055 if opts.get('rev'):
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2056 revs = scmutil.revrange(repo, opts['rev'])
24064 c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24063 diff changeset	2057 elif follow and repo.dirstate.p1() == nullid:
c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24063 diff changeset	2058 revs = revset.baseset()
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2059 elif follow:
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2060 revs = repo.revs('reverse(:.)')
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2061 else:
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2062 revs = revset.spanset(repo)
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2063 revs.reverse()
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2064 return revs
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2065
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2066 def getgraphlogrevs(repo, pats, opts):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2067 """Return (revs, expr, filematcher) where revs is an iterable of
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2068 revision numbers, expr is a revset string built from log options
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2069 and file patterns or None, and used to filter 'revs'. If --stat or
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2070 --patch are not passed filematcher is None. Otherwise it is a
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2071 callable taking a revision number and returning a match objects
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2072 filtering the files to be detailed when displaying the revision.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2073 """
18172 e6c5e0092469 cmdutil: make getgraphlogrevs limit-aware Siddharth Agarwal <sid0@fb.com> parents: 18171 diff changeset	2074 limit = loglimit(opts)
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2075 revs = _logrevs(repo, opts)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2076 if not revs:
20759 74139960c302 getgraphlogrevs: return an empty baseset instead of a empty list Lucas Moscovicz <lmoscovicz@fb.com> parents: 20758 diff changeset	2077 return revset.baseset(), None, None
21108 e5ad36a845af cmdutil: changed _makegraphlogrevset to _makelogrevset Lucas Moscovicz <lmoscovicz@fb.com> parents: 21051 diff changeset	2078 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
24060 eb1c9700d19d graphlog: move comment and flag denoting revs might be unsorted Yuya Nishihara <yuya@tcha.org> parents: 24059 diff changeset	2079 if opts.get('rev'):
eb1c9700d19d graphlog: move comment and flag denoting revs might be unsorted Yuya Nishihara <yuya@tcha.org> parents: 24059 diff changeset	2080 # User-specified revs might be unsorted, but don't sort before
eb1c9700d19d graphlog: move comment and flag denoting revs might be unsorted Yuya Nishihara <yuya@tcha.org> parents: 24059 diff changeset	2081 # _makelogrevset because it might depend on the order of revs
18169 ae663cba9a8d cmdutil: make getgraphlogrevs return revs in descending order Siddharth Agarwal <sid0@fb.com> parents: 18031 diff changeset	2082 revs.sort(reverse=True)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2083 if expr:
18171 9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2084 # Revset matchers often operate faster on revisions in changelog
9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2085 # order, because most filters deal with the changelog.
9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2086 revs.reverse()
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2087 matcher = revset.match(repo.ui, expr)
18171 9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2088 # Revset matches can reorder revisions. "A or B" typically returns
9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2089 # returns the revision matching A then the revision matching B. Sort
9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2090 # again to fix that.
9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2091 revs = matcher(repo, revs)
9d350f2d9458 cmdutil: stop pretending we can calculate revs for graphlog lazily Siddharth Agarwal <sid0@fb.com> parents: 18170 diff changeset	2092 revs.sort(reverse=True)
18243 b3b1b8e127e5 log: use "hidden" filtering instead of manual check at display time Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18235 diff changeset	2093 if limit is not None:
22807 cd43195ef876 getgraphlogrevs: remove user of baseset.append Pierre-Yves David <pierre-yves.david@fb.com> parents: 22806 diff changeset	2094 limitedrevs = []
20755 cfd03c069e08 cmdutil: changed code in getgraphlogrevs not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20710 diff changeset	2095 for idx, rev in enumerate(revs):
cfd03c069e08 cmdutil: changed code in getgraphlogrevs not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20710 diff changeset	2096 if idx >= limit:
cfd03c069e08 cmdutil: changed code in getgraphlogrevs not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20710 diff changeset	2097 break
cfd03c069e08 cmdutil: changed code in getgraphlogrevs not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20710 diff changeset	2098 limitedrevs.append(rev)
22807 cd43195ef876 getgraphlogrevs: remove user of baseset.append Pierre-Yves David <pierre-yves.david@fb.com> parents: 22806 diff changeset	2099 revs = revset.baseset(limitedrevs)
18172 e6c5e0092469 cmdutil: make getgraphlogrevs limit-aware Siddharth Agarwal <sid0@fb.com> parents: 18171 diff changeset	2100
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2101 return revs, expr, filematcher
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2102
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2103 def getlogrevs(repo, pats, opts):
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2104 """Return (revs, expr, filematcher) where revs is an iterable of
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2105 revision numbers, expr is a revset string built from log options
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2106 and file patterns or None, and used to filter 'revs'. If --stat or
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2107 --patch are not passed filematcher is None. Otherwise it is a
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2108 callable taking a revision number and returning a match objects
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2109 filtering the files to be detailed when displaying the revision.
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2110 """
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2111 limit = loglimit(opts)
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2112 revs = _logrevs(repo, opts)
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2113 if not revs:
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2114 return revset.baseset([]), None, None
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2115 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2116 if expr:
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2117 # Revset matchers often operate faster on revisions in changelog
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2118 # order, because most filters deal with the changelog.
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2119 if not opts.get('rev'):
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2120 revs.reverse()
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2121 matcher = revset.match(repo.ui, expr)
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2122 # Revset matches can reorder revisions. "A or B" typically returns
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2123 # returns the revision matching A then the revision matching B. Sort
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2124 # again to fix that.
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2125 revs = matcher(repo, revs)
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2126 if not opts.get('rev'):
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2127 revs.sort(reverse=True)
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2128 if limit is not None:
22806 65ccc733d58e getlogrevs: remove user of baseset.append Pierre-Yves David <pierre-yves.david@fb.com> parents: 22765 diff changeset	2129 limitedrevs = []
25169 7855d1f5f152 getlogrevs: rewrite a loop to get read of try/except Pierre-Yves David <pierre-yves.david@fb.com> parents: 25168 diff changeset	2130 for idx, r in enumerate(revs):
7855d1f5f152 getlogrevs: rewrite a loop to get read of try/except Pierre-Yves David <pierre-yves.david@fb.com> parents: 25168 diff changeset	2131 if limit <= idx:
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2132 break
25169 7855d1f5f152 getlogrevs: rewrite a loop to get read of try/except Pierre-Yves David <pierre-yves.david@fb.com> parents: 25168 diff changeset	2133 limitedrevs.append(r)
22806 65ccc733d58e getlogrevs: remove user of baseset.append Pierre-Yves David <pierre-yves.david@fb.com> parents: 22765 diff changeset	2134 revs = revset.baseset(limitedrevs)
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2135
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2136 return revs, expr, filematcher
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2137
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2138 def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None,
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2139 filematcher=None):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2140 seen, state = [], graphmod.asciistate()
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2141 for rev, type, ctx, parents in dag:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2142 char = 'o'
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2143 if ctx.node() in showparents:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2144 char = '@'
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2145 elif ctx.obsolete():
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2146 char = 'x'
24216 4bb348ae43cb log: display closing-branch nodes as "_" (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24213 diff changeset	2147 elif ctx.closesbranch():
4bb348ae43cb log: display closing-branch nodes as "_" (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24213 diff changeset	2148 char = '_'
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2149 copies = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2150 if getrenamed and ctx.rev():
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2151 copies = []
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2152 for fn in ctx.files():
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2153 rename = getrenamed(fn, ctx.rev())
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2154 if rename:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2155 copies.append((fn, rename[0]))
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2156 revmatchfn = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2157 if filematcher is not None:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2158 revmatchfn = filematcher(ctx.rev())
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2159 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2160 lines = displayer.hunk.pop(rev).split('\n')
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2161 if not lines[-1]:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2162 del lines[-1]
25763 60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	2163 displayer.flush(ctx)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2164 edges = edgefn(type, char, lines, seen, rev, parents)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2165 for type, char, lines, coldata in edges:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2166 graphmod.ascii(ui, state, type, char, lines, coldata)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2167 displayer.close()
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2168
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2169 def graphlog(ui, repo, pats, *opts):
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2170 # Parameters are identical to log command ones
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2171 revs, expr, filematcher = getgraphlogrevs(repo, pats, opts)
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2172 revdag = graphmod.dagwalker(repo, revs)
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2173
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2174 getrenamed = None
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2175 if opts.get('copies'):
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2176 endrev = None
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2177 if opts.get('rev'):
20760 d5fa413346e7 cmdutil: changed max method for lazy call Lucas Moscovicz <lmoscovicz@fb.com> parents: 20759 diff changeset	2178 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2179 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2180 displayer = show_changeset(ui, repo, opts, buffered=True)
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2181 showparents = [ctx.node() for ctx in repo[None].parents()]
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2182 displaygraph(ui, revdag, displayer, showparents,
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2183 graphmod.asciiedges, getrenamed, filematcher)
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2184
17182 cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2185 def checkunsupportedgraphflags(pats, opts):
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2186 for op in ["newest_first"]:
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2187 if op in opts and opts[op]:
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2188 raise util.Abort(_("-G/--graph option is incompatible with --%s")
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2189 % op.replace("_", "-"))
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2190
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2191 def graphrevs(repo, nodes, opts):
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2192 limit = loglimit(opts)
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2193 nodes.reverse()
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2194 if limit is not None:
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2195 nodes = nodes[:limit]
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2196 return graphmod.nodes(repo, nodes)
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2197
23885 9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2198 def add(ui, repo, match, prefix, explicitonly, **opts):
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2199 join = lambda f: os.path.join(prefix, f)
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2200 bad = []
25436 9724cbe2d546 add: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25424 diff changeset	2201
9724cbe2d546 add: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25424 diff changeset	2202 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2203 names = []
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2204 wctx = repo[None]
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2205 cca = None
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2206 abort, warn = scmutil.checkportabilityalert(ui)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2207 if abort or warn:
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17182 diff changeset	2208 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
25436 9724cbe2d546 add: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25424 diff changeset	2209
26206 ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2210 badmatch = matchmod.badmatch(match, badfn)
ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2211 dirstate = repo.dirstate
ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2212 # We don't want to just call wctx.walk here, since it would return a lot of
ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2213 # clean files, which we aren't interested in and takes time.
ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2214 for f in sorted(dirstate.walk(badmatch, sorted(wctx.substate),
ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2215 True, False, full=False)):
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2216 exact = match.exact(f)
23462 afa3fbbcabd3 add: use lexists so that broken symbolic links are added John Coomes <john.coomes@oracle.com> parents: 23453 diff changeset	2217 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2218 if cca:
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2219 cca(f)
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2220 names.append(f)
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2221 if ui.verbose or not exact:
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2222 ui.status(_('adding %s\n') % match.rel(f))
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2223
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18340 diff changeset	2224 for subpath in sorted(wctx.substate):
15410 9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2225 sub = wctx.sub(subpath)
9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2226 try:
9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2227 submatch = matchmod.narrowmatcher(subpath, match)
23885 9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2228 if opts.get('subrepos'):
9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2229 bad.extend(sub.add(ui, submatch, prefix, False, **opts))
15410 9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2230 else:
23885 9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2231 bad.extend(sub.add(ui, submatch, prefix, True, **opts))
15410 9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2232 except error.LookupError:
9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2233 ui.status(_("skipping missing subrepository: %s\n")
9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2234 % join(subpath))
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2235
23885 9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2236 if not opts.get('dry_run'):
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2237 rejected = wctx.add(names, prefix)
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2238 bad.extend(f for f in rejected if f in match.files())
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2239 return bad
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2240
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2241 def forget(ui, repo, match, prefix, explicitonly):
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2242 join = lambda f: os.path.join(prefix, f)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2243 bad = []
25437 9c1bcd95b3ff forget: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25436 diff changeset	2244 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2245 wctx = repo[None]
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2246 forgot = []
25437 9c1bcd95b3ff forget: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25436 diff changeset	2247
9c1bcd95b3ff forget: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25436 diff changeset	2248 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2249 forget = sorted(s[0] + s[1] + s[3] + s[6])
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2250 if explicitonly:
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2251 forget = [f for f in forget if match.exact(f)]
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2252
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18340 diff changeset	2253 for subpath in sorted(wctx.substate):
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2254 sub = wctx.sub(subpath)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2255 try:
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2256 submatch = matchmod.narrowmatcher(subpath, match)
23577 597b071a0e0d subrepo: drop the 'ui' parameter to forget() Matt Harbison <matt_harbison@yahoo.com> parents: 23576 diff changeset	2257 subbad, subforgot = sub.forget(submatch, prefix)
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2258 bad.extend([subpath + '/' + f for f in subbad])
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2259 forgot.extend([subpath + '/' + f for f in subforgot])
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2260 except error.LookupError:
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2261 ui.status(_("skipping missing subrepository: %s\n")
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2262 % join(subpath))
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2263
16070 f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	2264 if not explicitonly:
f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	2265 for f in match.files():
23673 69cd91d04117 forget: use vfs instead of os.path + match.rel() for filesystem checks Matt Harbison <matt_harbison@yahoo.com> parents: 23579 diff changeset	2266 if f not in repo.dirstate and not repo.wvfs.isdir(f):
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2267 if f not in forgot:
23673 69cd91d04117 forget: use vfs instead of os.path + match.rel() for filesystem checks Matt Harbison <matt_harbison@yahoo.com> parents: 23579 diff changeset	2268 if repo.wvfs.exists(f):
24548 c780a63f61ca forget: cleanup the output for an inexact case match on icasefs Matt Harbison <matt_harbison@yahoo.com> parents: 24169 diff changeset	2269 # Don't complain if the exact case match wasn't given.
c780a63f61ca forget: cleanup the output for an inexact case match on icasefs Matt Harbison <matt_harbison@yahoo.com> parents: 24169 diff changeset	2270 # But don't do this until after checking 'forgot', so
c780a63f61ca forget: cleanup the output for an inexact case match on icasefs Matt Harbison <matt_harbison@yahoo.com> parents: 24169 diff changeset	2271 # that subrepo files aren't normalized, and this op is
c780a63f61ca forget: cleanup the output for an inexact case match on icasefs Matt Harbison <matt_harbison@yahoo.com> parents: 24169 diff changeset	2272 # purely from data cached by the status walk above.
c780a63f61ca forget: cleanup the output for an inexact case match on icasefs Matt Harbison <matt_harbison@yahoo.com> parents: 24169 diff changeset	2273 if repo.dirstate.normalize(f) in repo.dirstate:
c780a63f61ca forget: cleanup the output for an inexact case match on icasefs Matt Harbison <matt_harbison@yahoo.com> parents: 24169 diff changeset	2274 continue
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2275 ui.warn(_('not removing %s: '
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2276 'file is already untracked\n')
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2277 % match.rel(f))
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2278 bad.append(f)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2279
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2280 for f in forget:
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2281 if ui.verbose or not match.exact(f):
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2282 ui.status(_('removing %s\n') % match.rel(f))
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2283
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2284 rejected = wctx.forget(forget, prefix)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2285 bad.extend(f for f in rejected if f in match.files())
23838 b95b9fd7ba29 forget: don't report rejected files as forgotten as well Matt Harbison <matt_harbison@yahoo.com> parents: 23772 diff changeset	2286 forgot.extend(f for f in forget if f not in rejected)
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2287 return bad, forgot
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2288
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2289 def files(ui, ctx, m, fm, fmt, subrepos):
24275 e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2290 rev = ctx.rev()
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2291 ret = 1
24301 18b5b2c9d921 files: replace 'ctx._repo' with 'ctx.repo()' Matt Harbison <matt_harbison@yahoo.com> parents: 24275 diff changeset	2292 ds = ctx.repo().dirstate
24275 e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2293
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2294 for f in ctx.matches(m):
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2295 if rev is None and ds[f] == 'r':
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2296 continue
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2297 fm.startitem()
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2298 if ui.verbose:
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2299 fc = ctx[f]
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2300 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2301 fm.data(abspath=f)
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2302 fm.write('path', fmt, m.rel(f))
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2303 ret = 0
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2304
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2305 for subpath in sorted(ctx.substate):
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2306 def matchessubrepo(subpath):
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2307 return (m.always() or m.exact(subpath)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2308 or any(f.startswith(subpath + '/') for f in m.files()))
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2309
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2310 if subrepos or matchessubrepo(subpath):
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2311 sub = ctx.sub(subpath)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2312 try:
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2313 submatch = matchmod.narrowmatcher(subpath, m)
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2314 if sub.printfiles(ui, submatch, fm, fmt, subrepos) == 0:
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2315 ret = 0
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2316 except error.LookupError:
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2317 ui.status(_("skipping missing subrepository: %s\n")
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2318 % m.abs(subpath))
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2319
24275 e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2320 return ret
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2321
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2322 def remove(ui, repo, m, prefix, after, force, subrepos):
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2323 join = lambda f: os.path.join(prefix, f)
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2324 ret = 0
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2325 s = repo.status(match=m, clean=True)
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2326 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2327
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2328 wctx = repo[None]
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2329
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2330 for subpath in sorted(wctx.substate):
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2331 def matchessubrepo(matcher, subpath):
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2332 if matcher.exact(subpath):
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2333 return True
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2334 for f in matcher.files():
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2335 if f.startswith(subpath):
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2336 return True
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2337 return False
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2338
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	2339 if subrepos or matchessubrepo(m, subpath):
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2340 sub = wctx.sub(subpath)
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2341 try:
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2342 submatch = matchmod.narrowmatcher(subpath, m)
23578 d0546e8e1def subrepo: drop the 'ui' parameter to removefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23577 diff changeset	2343 if sub.removefiles(submatch, prefix, after, force, subrepos):
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2344 ret = 1
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2345 except error.LookupError:
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2346 ui.status(_("skipping missing subrepository: %s\n")
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2347 % join(subpath))
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2348
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2349 # warn about failure to delete explicit files/dirs
24635 21e1ece30f8c util: move dirs() and finddirs() from scmutil to util Drew Gottlieb <drgott@google.com> parents: 24603 diff changeset	2350 deleteddirs = util.dirs(deleted)
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2351 for f in m.files():
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2352 def insubrepo():
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2353 for subpath in wctx.substate:
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2354 if f.startswith(subpath):
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2355 return True
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2356 return False
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2357
24955 1df233bcb7f6 remove: use ctx.hasdir(f) instead of 'f in ctx.dirs()' Martin von Zweigbergk <martinvonz@google.com> parents: 24947 diff changeset	2358 isdir = f in deleteddirs or wctx.hasdir(f)
24213 e0c1328df872 workingctx: use normal dirs() instead of dirstate.dirs() Durham Goode <durham@fb.com> parents: 24180 diff changeset	2359 if f in repo.dirstate or isdir or f == '.' or insubrepo():
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2360 continue
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2361
23674 6e36b9fc7869 remove: use vfs instead of os.path + match.rel() for filesystem checks Matt Harbison <matt_harbison@yahoo.com> parents: 23673 diff changeset	2362 if repo.wvfs.exists(f):
6e36b9fc7869 remove: use vfs instead of os.path + match.rel() for filesystem checks Matt Harbison <matt_harbison@yahoo.com> parents: 23673 diff changeset	2363 if repo.wvfs.isdir(f):
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2364 ui.warn(_('not removing %s: no tracked files\n')
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2365 % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2366 else:
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2367 ui.warn(_('not removing %s: file is untracked\n')
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2368 % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2369 # missing files will generate a warning elsewhere
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2370 ret = 1
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2371
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2372 if force:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2373 list = modified + deleted + clean + added
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2374 elif after:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2375 list = deleted
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2376 for f in modified + added + clean:
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2377 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2378 ret = 1
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2379 else:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2380 list = deleted + clean
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2381 for f in modified:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2382 ui.warn(_('not removing %s: file is modified (use -f'
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2383 ' to force removal)\n') % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2384 ret = 1
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2385 for f in added:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2386 ui.warn(_('not removing %s: file has been marked for add'
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2387 ' (use forget to undo)\n') % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2388 ret = 1
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2389
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2390 for f in sorted(list):
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2391 if ui.verbose or not m.exact(f):
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2392 ui.status(_('removing %s\n') % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2393
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2394 wlock = repo.wlock()
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2395 try:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2396 if not after:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2397 for f in list:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2398 if f in added:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2399 continue # we never unlink added files on remove
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2400 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2401 repo[None].forget(list)
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2402 finally:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2403 wlock.release()
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2404
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2405 return ret
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2406
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2407 def cat(ui, repo, ctx, matcher, prefix, **opts):
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2408 err = 1
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2409
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2410 def write(path):
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2411 fp = makefileobj(repo, opts.get('output'), ctx.node(),
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2412 pathname=os.path.join(prefix, path))
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2413 data = ctx[path].data()
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2414 if opts.get('decode'):
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2415 data = repo.wwritedata(path, data)
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2416 fp.write(data)
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2417 fp.close()
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2418
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2419 # Automation often uses hg cat on single files, so special case it
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2420 # for performance to avoid the cost of parsing the manifest.
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2421 if len(matcher.files()) == 1 and not matcher.anypats():
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2422 file = matcher.files()[0]
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2423 mf = repo.manifest
24718 a4191e0c728f cat: use ctx.manifestnode() in place of ctx._changeset[0] Yuya Nishihara <yuya@tcha.org> parents: 24711 diff changeset	2424 mfnode = ctx.manifestnode()
24720 c560d8c68791 cat: disable optimization of single file case for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24718 diff changeset	2425 if mfnode and mf.find(mfnode, file)[0]:
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2426 write(file)
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2427 return 0
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2428
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2429 # Don't warn about "missing" files that are really in subrepos
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2430 def badfn(path, msg):
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2431 for subpath in ctx.substate:
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2432 if path.startswith(subpath):
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2433 return
25438 7ce5a3230441 cat: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25437 diff changeset	2434 matcher.bad(path, msg)
7ce5a3230441 cat: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25437 diff changeset	2435
7ce5a3230441 cat: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25437 diff changeset	2436 for abs in ctx.walk(matchmod.badmatch(matcher, badfn)):
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2437 write(abs)
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2438 err = 0
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2439
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2440 for subpath in sorted(ctx.substate):
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2441 sub = ctx.sub(subpath)
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2442 try:
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2443 submatch = matchmod.narrowmatcher(subpath, matcher)
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2444
23576 70a7478c33de subrepo: drop the 'ui' parameter to cat() Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	2445 if not sub.cat(submatch, os.path.join(prefix, sub._path),
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2446 **opts):
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2447 err = 0
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2448 except error.RepoLookupError:
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2449 ui.status(_("skipping missing subrepository: %s\n")
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2450 % os.path.join(prefix, subpath))
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2451
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2452 return err
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2453
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	2454 def commit(ui, repo, commitfunc, pats, opts):
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	2455 '''commit the specified files or all outstanding changes'''
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	2456 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	2457 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	2458 opts['date'] = util.parsedate(date)
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14518 diff changeset	2459 message = logmessage(ui, opts)
23533 891aaa7c0c70 scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns Matt Harbison <matt_harbison@yahoo.com> parents: 23509 diff changeset	2460 matcher = scmutil.match(repo[None], pats, opts)
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	2461
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	2462 # extract addremove carefully -- this function can be called from a command
784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	2463 # that doesn't support addremove
784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	2464 if opts.get('addremove'):
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23535 diff changeset	2465 if scmutil.addremove(repo, matcher, "", opts) != 0:
23535 72c23fa4f52f commit: abort if --addremove is specified, but fails Matt Harbison <matt_harbison@yahoo.com> parents: 23533 diff changeset	2466 raise util.Abort(
72c23fa4f52f commit: abort if --addremove is specified, but fails Matt Harbison <matt_harbison@yahoo.com> parents: 23533 diff changeset	2467 _("failed to mark all new/missing files as added/removed"))
23533 891aaa7c0c70 scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns Matt Harbison <matt_harbison@yahoo.com> parents: 23509 diff changeset	2468
891aaa7c0c70 scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns Matt Harbison <matt_harbison@yahoo.com> parents: 23509 diff changeset	2469 return commitfunc(ui, repo, message, matcher, opts)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2470
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2471 def amend(ui, repo, commitfunc, old, extra, pats, opts):
25930 221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	2472 # avoid cycle context -> subrepo -> cmdutil
221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	2473 import context
221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	2474
23101 b564330d4b1f amend: abort early if no username is configured with evolve enabled (issue4211) Matt Harbison <matt_harbison@yahoo.com> parents: 22951 diff changeset	2475 # amend will reuse the existing user if not specified, but the obsolete
b564330d4b1f amend: abort early if no username is configured with evolve enabled (issue4211) Matt Harbison <matt_harbison@yahoo.com> parents: 22951 diff changeset	2476 # marker creation requires that the current user's name is specified.
24379 8c445d8a915b obsolete: remove last instance of _enabled Durham Goode <durham@fb.com> parents: 24364 diff changeset	2477 if obsolete.isenabled(repo, obsolete.createmarkersopt):
23101 b564330d4b1f amend: abort early if no username is configured with evolve enabled (issue4211) Matt Harbison <matt_harbison@yahoo.com> parents: 22951 diff changeset	2478 ui.username() # raise exception if username not set
b564330d4b1f amend: abort early if no username is configured with evolve enabled (issue4211) Matt Harbison <matt_harbison@yahoo.com> parents: 22951 diff changeset	2479
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2480 ui.note(_('amending changeset %s\n') % old)
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2481 base = old.p1()
25709 c87373179ff3 amend: move createmarkers evaluation earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 25694 diff changeset	2482 createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2483
24993 be58bd30a478 amend: use dirstateguard instead of dirstate.invalidate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24991 diff changeset	2484 wlock = dsguard = lock = newid = None
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2485 try:
17471 ad1561723dde amend: lock the repository during the whole process Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17468 diff changeset	2486 wlock = repo.wlock()
24993 be58bd30a478 amend: use dirstateguard instead of dirstate.invalidate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24991 diff changeset	2487 dsguard = dirstateguard(repo, 'amend')
17471 ad1561723dde amend: lock the repository during the whole process Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17468 diff changeset	2488 lock = repo.lock()
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2489 tr = repo.transaction('amend')
17049 2440822446ce amend: disable hooks when creating intermediate commit (issue3501) Idan Kamara <idankk86@gmail.com> parents: 16678 diff changeset	2490 try:
17473 9732473aa24b amend: use an explicit commit message for temporary amending commit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17472 diff changeset	2491 # See if we got a message from -m or -l, if not, open the editor
9732473aa24b amend: use an explicit commit message for temporary amending commit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17472 diff changeset	2492 # with the message of the changeset to amend
9732473aa24b amend: use an explicit commit message for temporary amending commit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17472 diff changeset	2493 message = logmessage(ui, opts)
17863 034e55bbf7c0 amend: fix incompatibity between logfile and message option (issue3675) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17812 diff changeset	2494 # ensure logfile does not conflict with later enforcement of the
034e55bbf7c0 amend: fix incompatibity between logfile and message option (issue3675) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17812 diff changeset	2495 # message. potential logfile content has been processed by
034e55bbf7c0 amend: fix incompatibity between logfile and message option (issue3675) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17812 diff changeset	2496 # `logmessage` anyway.
034e55bbf7c0 amend: fix incompatibity between logfile and message option (issue3675) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17812 diff changeset	2497 opts.pop('logfile')
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2498 # First, do a regular commit to record all changes in the working
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2499 # directory (if there are any)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2500 ui.callhooks = False
25100 d6e7ac651973 bookmarks: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 25020 diff changeset	2501 activebookmark = repo._activebookmark
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2502 try:
24947 a02d293a1079 bookmarks: rename bookmarkcurrent to activebookmark (API) Ryan McElroy <rmcelroy@fb.com> parents: 24866 diff changeset	2503 repo._activebookmark = None
17473 9732473aa24b amend: use an explicit commit message for temporary amending commit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17472 diff changeset	2504 opts['message'] = 'temporary amend commit for %s' % old
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2505 node = commit(ui, repo, commitfunc, pats, opts)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2506 finally:
25100 d6e7ac651973 bookmarks: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 25020 diff changeset	2507 repo._activebookmark = activebookmark
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2508 ui.callhooks = True
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2509 ctx = repo[node]
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2510
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2511 # Participating changesets:
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2512 #
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2513 # node/ctx o - new (intermediate) commit that contains changes
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2514 # \| from working dir to go into amending commit
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2515 # \| (or a workingctx if there were no changes)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2516 # \|
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2517 # old o - changeset to amend
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2518 # \|
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2519 # base o - parent of amending changeset
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2520
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2521 # Update extra dict from amended commit (e.g. to preserve graft
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2522 # source)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2523 extra.update(old.extra())
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	2524
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2525 # Also update it from the intermediate commit or from the wctx
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2526 extra.update(ctx.extra())
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	2527
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2528 if len(old.parents()) > 1:
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2529 # ctx.files() isn't reliable for merges, so fall back to the
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2530 # slower repo.status() method
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2531 files = set([fn for st in repo.status(base, old)[:3]
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2532 for fn in st])
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2533 else:
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2534 files = set(old.files())
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2535
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2536 # Second, we use either the commit we just did, or if there were no
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2537 # changes the parent of the working directory as the version of the
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2538 # files in the final amend commit
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2539 if node:
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2540 ui.note(_('copying changeset %s to %s\n') % (ctx, base))
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2541
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2542 user = ctx.user()
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2543 date = ctx.date()
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2544 # Recompute copies (avoid recording a -> b -> a)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2545 copied = copies.pathcopies(base, ctx)
24169 ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24013 diff changeset	2546 if old.p2:
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24013 diff changeset	2547 copied.update(copies.pathcopies(old.p2(), ctx))
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2548
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2549 # Prune files which were reverted by the updates: if old
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2550 # introduced file X and our intermediate commit, node,
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2551 # renamed that file, then those two files are the same and
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2552 # we can discard X from our list of files. Likewise if X
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2553 # was deleted, it's no longer relevant
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2554 files.update(ctx.files())
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2555
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2556 def samefile(f):
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2557 if f in ctx.manifest():
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2558 a = ctx.filectx(f)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2559 if f in base.manifest():
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2560 b = base.filectx(f)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2561 return (not a.cmp(b)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2562 and a.flags() == b.flags())
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2563 else:
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2564 return False
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2565 else:
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2566 return f not in base.manifest()
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2567 files = [f for f in files if not samefile(f)]
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2568
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2569 def filectxfn(repo, ctx_, path):
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2570 try:
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2571 fctx = ctx[path]
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2572 flags = fctx.flags()
21689 503bb3af70fe memfilectx: call super.__init__ instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 21579 diff changeset	2573 mctx = context.memfilectx(repo,
503bb3af70fe memfilectx: call super.__init__ instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 21579 diff changeset	2574 fctx.path(), fctx.data(),
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2575 islink='l' in flags,
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2576 isexec='x' in flags,
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2577 copied=copied.get(path))
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2578 return mctx
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2579 except KeyError:
22296 650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22278 diff changeset	2580 return None
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2581 else:
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2582 ui.note(_('copying changeset %s to %s\n') % (old, base))
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2583
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2584 # Use version of files as in the old cset
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2585 def filectxfn(repo, ctx_, path):
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2586 try:
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2587 return old.filectx(path)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2588 except KeyError:
22296 650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22278 diff changeset	2589 return None
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2590
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2591 user = opts.get('user') or old.user()
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2592 date = opts.get('date') or old.date()
22249 f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22248 diff changeset	2593 editform = mergeeditform(old, 'commit.amend')
22010 41e969cb9468 commit: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21999 diff changeset	2594 editor = getcommiteditor(editform=editform, **opts)
17473 9732473aa24b amend: use an explicit commit message for temporary amending commit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17472 diff changeset	2595 if not message:
22010 41e969cb9468 commit: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21999 diff changeset	2596 editor = getcommiteditor(edit=True, editform=editform)
17473 9732473aa24b amend: use an explicit commit message for temporary amending commit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17472 diff changeset	2597 message = old.description()
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2598
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2599 pureextra = extra.copy()
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2600 extra['amend_source'] = old.hex()
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2601
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2602 new = context.memctx(repo,
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18853 diff changeset	2603 parents=[base.node(), old.p2().node()],
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2604 text=message,
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2605 files=files,
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2606 filectxfn=filectxfn,
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2607 user=user,
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2608 date=date,
21240 1a833fcf5a14 amend: use "editor" argument for "memctx.__init__" to save commit message FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21127 diff changeset	2609 extra=extra,
1a833fcf5a14 amend: use "editor" argument for "memctx.__init__" to save commit message FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21127 diff changeset	2610 editor=editor)
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2611
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2612 newdesc = changelog.stripdesc(new.description())
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2613 if ((not node)
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2614 and newdesc == old.description()
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2615 and user == old.user()
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2616 and date == old.date()
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2617 and pureextra == old.extra()):
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2618 # nothing changed. continuing here would create a new node
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2619 # anyway because of the amend_source noise.
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2620 #
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2621 # This not what we expect from amend.
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2622 return old.node()
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17788 diff changeset	2623
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2624 ph = repo.ui.config('phases', 'new-commit', phases.draft)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2625 try:
20700 b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20072 diff changeset	2626 if opts.get('secret'):
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20072 diff changeset	2627 commitphase = 'secret'
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20072 diff changeset	2628 else:
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20072 diff changeset	2629 commitphase = old.phase()
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	2630 repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend')
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2631 newid = repo.commitctx(new)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2632 finally:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	2633 repo.ui.setconfig('phases', 'new-commit', ph, 'amend')
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2634 if newid != old.node():
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2635 # Reroute the working copy parent to the new changeset
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2636 repo.setparents(newid, nullid)
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2637
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2638 # Move bookmarks from old parent to amend commit
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2639 bms = repo.nodebookmarks(old.node())
965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2640 if bms:
17922 7f5dab94e48c bookmarks: introduce a bmstore to manage bookmark persistence Augie Fackler <raf@durin42.com> parents: 17891 diff changeset	2641 marks = repo._bookmarks
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2642 for bm in bms:
25694 5ede49f4383a amend: stop updating the bookmarks twice Pierre-Yves David <pierre-yves.david@fb.com> parents: 25693 diff changeset	2643 ui.debug('moving bookmarks %r from %s to %s\n' %
5ede49f4383a amend: stop updating the bookmarks twice Pierre-Yves David <pierre-yves.david@fb.com> parents: 25693 diff changeset	2644 (marks, old.hex(), hex(newid)))
17922 7f5dab94e48c bookmarks: introduce a bmstore to manage bookmark persistence Augie Fackler <raf@durin42.com> parents: 17891 diff changeset	2645 marks[bm] = newid
25693 a6c1eac2fb1e amend: collaborate with the transaction when moving bookmarks Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	2646 marks.recordchange(tr)
25710 68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2647 #commit the whole amend process
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2648 if createmarkers:
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2649 # mark the new changeset as successor of the rewritten one
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2650 new = repo[newid]
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2651 obs = [(old, (new,))]
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2652 if node:
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2653 obs.append((ctx, ()))
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2654
68c83b8d407a amend: move obsmarkers creation in the "new changeset" conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 25709 diff changeset	2655 obsolete.createmarkers(repo, obs)
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2656 tr.close()
17461 bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17391 diff changeset	2657 finally:
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	2658 tr.release()
24993 be58bd30a478 amend: use dirstateguard instead of dirstate.invalidate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24991 diff changeset	2659 dsguard.close()
22951 6c86c673dde6 obsolete: add createmarkers option Durham Goode <durham@fb.com> parents: 22901 diff changeset	2660 if not createmarkers and newid != old.node():
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	2661 # Strip the intermediate commit (if there was one) and the amended
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	2662 # commit
17471 ad1561723dde amend: lock the repository during the whole process Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17468 diff changeset	2663 if node:
ad1561723dde amend: lock the repository during the whole process Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17468 diff changeset	2664 ui.note(_('stripping intermediate changeset %s\n') % ctx)
ad1561723dde amend: lock the repository during the whole process Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17468 diff changeset	2665 ui.note(_('stripping amended changeset %s\n') % old)
ad1561723dde amend: lock the repository during the whole process Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17468 diff changeset	2666 repair.strip(ui, repo, old.node(), topic='amend-backup')
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2667 finally:
24993 be58bd30a478 amend: use dirstateguard instead of dirstate.invalidate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24991 diff changeset	2668 lockmod.release(lock, dsguard, wlock)
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2669 return newid
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	2670
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	2671 def commiteditor(repo, ctx, subs, editform=''):
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2672 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2673 return ctx.description()
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	2674 return commitforceeditor(repo, ctx, subs, editform=editform)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2675
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	2676 def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None,
6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	2677 editform=''):
21923 e582e20cd3e6 commiteditor: refactor default extramsg Matt Mackall <mpm@selenic.com> parents: 21878 diff changeset	2678 if not extramsg:
e582e20cd3e6 commiteditor: refactor default extramsg Matt Mackall <mpm@selenic.com> parents: 21878 diff changeset	2679 extramsg = _("Leave message empty to abort commit.")
22012 9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2680
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2681 forms = [e for e in editform.split('.') if e]
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2682 forms.insert(0, 'changeset')
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2683 while forms:
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2684 tmpl = repo.ui.config('committemplate', '.'.join(forms))
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2685 if tmpl:
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2686 committext = buildcommittemplate(repo, ctx, subs, extramsg, tmpl)
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2687 break
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	2688 forms.pop()
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2689 else:
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2690 committext = buildcommittext(repo, ctx, subs, extramsg)
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2691
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2692 # run editor in the repository root
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2693 olddir = os.getcwd()
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2694 os.chdir(repo.root)
22205 9fa429723f26 ui: invoke editor for committing with HGEDITFORM environment variable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22190 diff changeset	2695 text = repo.ui.edit(committext, ctx.user(), ctx.extra(), editform=editform)
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2696 text = re.sub("(?m)^HG:.*(\n\|$)", "", text)
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2697 os.chdir(olddir)
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2698
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2699 if finishdesc:
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2700 text = finishdesc(text)
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2701 if not text.strip():
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2702 raise util.Abort(_("empty commit message"))
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2703
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2704 return text
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2705
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2706 def buildcommittemplate(repo, ctx, subs, extramsg, tmpl):
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2707 ui = repo.ui
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2708 tmpl, mapfile = gettemplate(ui, tmpl, None)
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2709
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2710 try:
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2711 t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	2712 except SyntaxError as inst:
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2713 raise util.Abort(inst.args[0])
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2714
22013 de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22012 diff changeset	2715 for k, v in repo.ui.configitems('committemplate'):
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22012 diff changeset	2716 if k != 'changeset':
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22012 diff changeset	2717 t.t.cache[k] = v
de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22012 diff changeset	2718
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2719 if not extramsg:
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2720 extramsg = '' # ensure that extramsg is string
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2721
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2722 ui.pushbuffer()
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2723 t.show(ctx, extramsg=extramsg)
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2724 return ui.popbuffer()
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	2725
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2726 def hgprefix(msg):
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2727 return "\n".join(["HG: %s" % a for a in msg.split("\n") if a])
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2728
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2729 def buildcommittext(repo, ctx, subs, extramsg):
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2730 edittext = []
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	2731 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2732 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2733 edittext.append(ctx.description())
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2734 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2735 edittext.append("") # Empty line between message and comments.
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2736 edittext.append(hgprefix(_("Enter commit message."
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2737 " Lines beginning with 'HG:' are removed.")))
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2738 edittext.append(hgprefix(extramsg))
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2739 edittext.append("HG: --")
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2740 edittext.append(hgprefix(_("user: %s") % ctx.user()))
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2741 if ctx.p2():
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2742 edittext.append(hgprefix(_("branch merge")))
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2743 if ctx.branch():
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2744 edittext.append(hgprefix(_("branch '%s'") % ctx.branch()))
24986 fb9b7b937b3e bookmarks: simplify iscurrent to isactivewdirparent (API) Ryan McElroy <rmcelroy@fb.com> parents: 24955 diff changeset	2745 if bookmarks.isactivewdirparent(repo):
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2746 edittext.append(hgprefix(_("bookmark '%s'") % repo._activebookmark))
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2747 edittext.extend([hgprefix(_("subrepo %s") % s) for s in subs])
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2748 edittext.extend([hgprefix(_("added %s") % f) for f in added])
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2749 edittext.extend([hgprefix(_("changed %s") % f) for f in modified])
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2750 edittext.extend([hgprefix(_("removed %s") % f) for f in removed])
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	2751 if not added and not modified and not removed:
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	2752 edittext.append(hgprefix(_("no files changed")))
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2753 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	2754
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	2755 return "\n".join(edittext)
14297 2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	2756
26324 4a8e21578e14 addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26229 diff changeset	2757 def commitstatus(repo, node, branch, bheads=None, opts=None):
4a8e21578e14 addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26229 diff changeset	2758 if opts is None:
4a8e21578e14 addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26229 diff changeset	2759 opts = {}
18688 79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2760 ctx = repo[node]
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2761 parents = ctx.parents()
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2762
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2763 if (not opts.get('amend') and bheads and node not in bheads and not
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2764 [x for x in parents if x.node() in bheads and x.branch() == branch]):
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2765 repo.ui.status(_('created new head\n'))
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2766 # The message is not printed for initial roots. For the other
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2767 # changesets, it is printed in the following situations:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2768 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2769 # Par column: for the 2 parents with ...
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2770 # N: null or no parent
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2771 # B: parent is on another named branch
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2772 # C: parent is a regular non head changeset
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2773 # H: parent was a branch head of the current branch
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2774 # Msg column: whether we print "created new head" message
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2775 # In the following, it is assumed that there already exists some
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2776 # initial branch heads of the current branch, otherwise nothing is
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2777 # printed anyway.
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2778 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2779 # Par Msg Comment
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2780 # N N y additional topo root
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2781 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2782 # B N y additional branch root
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2783 # C N y additional topo head
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2784 # H N n usual case
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2785 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2786 # B B y weird additional branch root
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2787 # C B y branch merge
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2788 # H B n merge with named branch
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2789 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2790 # C C y additional head from merge
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2791 # C H n merge with a head
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2792 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2793 # H H n head merge: head count decreases
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2794
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2795 if not opts.get('close_branch'):
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2796 for r in parents:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2797 if r.closesbranch() and r.branch() == branch:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2798 repo.ui.status(_('reopening closed branch head %d\n') % r)
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2799
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2800 if repo.ui.debugflag:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2801 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2802 elif repo.ui.verbose:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2803 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	2804
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2805 def revert(ui, repo, ctx, parents, pats, *opts):
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2806 parent, p2 = parents
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2807 node = ctx.node()
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2808
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2809 mf = ctx.manifest()
21579 87a972b5c039 revert: use p2 as parent when reverting against it Pierre-Yves David <pierre-yves.david@fb.com> parents: 21578 diff changeset	2810 if node == p2:
87a972b5c039 revert: use p2 as parent when reverting against it Pierre-Yves David <pierre-yves.david@fb.com> parents: 21578 diff changeset	2811 parent = p2
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2812 if node == parent:
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2813 pmf = mf
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2814 else:
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2815 pmf = None
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2816
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2817 # need all matching names in dirstate and manifest of target rev,
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2818 # so have to walk both. do not print errors if files exist in one
24451 c3bbafef25d6 revert: comment that filesets are always evaluated against workingctx Yuya Nishihara <yuya@tcha.org> parents: 24450 diff changeset	2819 # but not other. in both cases, filesets should be evaluated against
c3bbafef25d6 revert: comment that filesets are always evaluated against workingctx Yuya Nishihara <yuya@tcha.org> parents: 24450 diff changeset	2820 # workingctx to get consistent result (issue4497). this means 'set:**'
c3bbafef25d6 revert: comment that filesets are always evaluated against workingctx Yuya Nishihara <yuya@tcha.org> parents: 24450 diff changeset	2821 # cannot be used to select missing files from target rev.
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2822
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2823 # `names` is a mapping for all elements in working copy and target revision
8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2824 # The mapping is in the form:
8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2825 # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2826 names = {}
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2827
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2828 wlock = repo.wlock()
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2829 try:
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2830 ## filling of the `names` mapping
8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2831 # walk dirstate to fill `names`
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2832
24475 06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	2833 interactive = opts.get('interactive', False)
24449 bab983bb6fd1 revert: define 'wctx' a little earlier and use it more Martin von Zweigbergk <martinvonz@google.com> parents: 24438 diff changeset	2834 wctx = repo[None]
bab983bb6fd1 revert: define 'wctx' a little earlier and use it more Martin von Zweigbergk <martinvonz@google.com> parents: 24438 diff changeset	2835 m = scmutil.match(wctx, pats, opts)
24479 871485bd03fd revert: move calculation of targetsubs earlier Matt Mackall <mpm@selenic.com> parents: 24476 diff changeset	2836
871485bd03fd revert: move calculation of targetsubs earlier Matt Mackall <mpm@selenic.com> parents: 24476 diff changeset	2837 # we'll need this later
871485bd03fd revert: move calculation of targetsubs earlier Matt Mackall <mpm@selenic.com> parents: 24476 diff changeset	2838 targetsubs = sorted(s for s in wctx.substate if m(s))
871485bd03fd revert: move calculation of targetsubs earlier Matt Mackall <mpm@selenic.com> parents: 24476 diff changeset	2839
24450 961790c35b4f revert: take fast path also when not reverting to '.' Martin von Zweigbergk <martinvonz@google.com> parents: 24449 diff changeset	2840 if not m.always():
25439 aaede04c0ba6 revert: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25438 diff changeset	2841 for abs in repo.walk(matchmod.badmatch(m, lambda x, y: False)):
22573 f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2842 names[abs] = m.rel(abs), m.exact(abs)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2843
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2844 # walk target manifest to fill `names`
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2845
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2846 def badfn(path, msg):
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2847 if path in names:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2848 return
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2849 if path in ctx.substate:
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2850 return
22573 f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2851 path_ = path + '/'
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2852 for f in names:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2853 if f.startswith(path_):
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2854 return
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2855 ui.warn("%s: %s\n" % (m.rel(path), msg))
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2856
25439 aaede04c0ba6 revert: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25438 diff changeset	2857 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
22573 f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2858 if abs not in names:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2859 names[abs] = m.rel(abs), m.exact(abs)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2860
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2861 # Find status of all file in `names`.
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2862 m = scmutil.matchfiles(repo, names)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2863
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2864 changes = repo.status(node1=node, match=m,
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2865 unknown=True, ignored=True, clean=True)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2866 else:
24450 961790c35b4f revert: take fast path also when not reverting to '.' Martin von Zweigbergk <martinvonz@google.com> parents: 24449 diff changeset	2867 changes = repo.status(node1=node, match=m)
22573 f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2868 for kind in changes:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2869 for abs in kind:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2870 names[abs] = m.rel(abs), m.exact(abs)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2871
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2872 m = scmutil.matchfiles(repo, names)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	2873
23374 aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2874 modified = set(changes.modified)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2875 added = set(changes.added)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2876 removed = set(changes.removed)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2877 _deleted = set(changes.deleted)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2878 unknown = set(changes.unknown)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2879 unknown.update(changes.ignored)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2880 clean = set(changes.clean)
22610 0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	2881 modadded = set()
22185 afead12e724b revert: triage "deleted" files into more appropriate categories Pierre-Yves David <pierre-yves.david@fb.com> parents: 22173 diff changeset	2882
afead12e724b revert: triage "deleted" files into more appropriate categories Pierre-Yves David <pierre-yves.david@fb.com> parents: 22173 diff changeset	2883 # split between files known in target manifest and the others
afead12e724b revert: triage "deleted" files into more appropriate categories Pierre-Yves David <pierre-yves.david@fb.com> parents: 22173 diff changeset	2884 smf = set(mf)
afead12e724b revert: triage "deleted" files into more appropriate categories Pierre-Yves David <pierre-yves.david@fb.com> parents: 22173 diff changeset	2885
afead12e724b revert: triage "deleted" files into more appropriate categories Pierre-Yves David <pierre-yves.david@fb.com> parents: 22173 diff changeset	2886 # determine the exact nature of the deleted changesets
22490 bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	2887 deladded = _deleted - smf
bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	2888 deleted = _deleted - deladded
22155 530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2889
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	2890 # We need to account for the state of the file in the dirstate,
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	2891 # even when we revert against something else than parent. This will
22155 530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2892 # slightly alter the behavior of revert (doing back up or not, delete
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23101 diff changeset	2893 # or just forget etc).
22155 530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2894 if parent == node:
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2895 dsmodified = modified
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2896 dsadded = added
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2897 dsremoved = removed
23403 edf29f9c15f0 revert: look for copy information for all local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 23101 diff changeset	2898 # store all local modifications, useful later for rename detection
edf29f9c15f0 revert: look for copy information for all local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 23101 diff changeset	2899 localchanges = dsmodified \| dsadded
22155 530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2900 modified, added, removed = set(), set(), set()
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2901 else:
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	2902 changes = repo.status(node1=parent, match=m)
23374 aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2903 dsmodified = set(changes.modified)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2904 dsadded = set(changes.added)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	2905 dsremoved = set(changes.removed)
23403 edf29f9c15f0 revert: look for copy information for all local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 23101 diff changeset	2906 # store all local modifications, useful later for rename detection
edf29f9c15f0 revert: look for copy information for all local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 23101 diff changeset	2907 localchanges = dsmodified \| dsadded
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2908
22188 0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	2909 # only take into account for removes between wc and target
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	2910 clean \|= dsremoved - removed
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	2911 dsremoved &= removed
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	2912 # distinct between dirstate remove and other
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	2913 removed -= dsremoved
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	2914
22610 0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	2915 modadded = added & dsmodified
0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	2916 added -= modadded
0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	2917
22190 55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	2918 # tell newly modified apart.
55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	2919 dsmodified &= modified
55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	2920 dsmodified \|= modified & dsadded # dirstate added may needs backup
55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	2921 modified -= dsmodified
55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	2922
22488 6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2923 # We need to wait for some post-processing to update this set
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2924 # before making the distinction. The dirstate will be used for
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2925 # that purpose.
22208 d3659b3795e9 revert: simplify handling of `added` files Pierre-Yves David <pierre-yves.david@fb.com> parents: 22205 diff changeset	2926 dsadded = added
d3659b3795e9 revert: simplify handling of `added` files Pierre-Yves David <pierre-yves.david@fb.com> parents: 22205 diff changeset	2927
22209 06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2928 # in case of merge, files that are actually added can be reported as
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2929 # modified, we need to post process the result
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2930 if p2 != nullid:
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2931 if pmf is None:
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2932 # only need parent manifest in the merge case,
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2933 # so do not read by default
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2934 pmf = repo[parent].manifest()
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2935 mergeadd = dsmodified - set(pmf)
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2936 dsadded \|= mergeadd
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	2937 dsmodified -= mergeadd
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2938
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2939 # if f is a rename, update `names` to also revert the source
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2940 cwd = repo.getcwd()
23403 edf29f9c15f0 revert: look for copy information for all local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 23101 diff changeset	2941 for f in localchanges:
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2942 src = repo.dirstate.copied(f)
22213 f1debbcd71cd revert: add an XXX about rename tracking Pierre-Yves David <pierre-yves.david@fb.com> parents: 22212 diff changeset	2943 # XXX should we check for rename down to target node?
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2944 if src and src not in names and repo.dirstate[src] == 'r':
22154 fc422de25773 revert: prefix variable names for dirstate status with "ds" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22153 diff changeset	2945 dsremoved.add(src)
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2946 names[src] = (repo.pathto(src, cwd), True)
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2947
22488 6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2948 # distinguish between file to forget and the other
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2949 added = set()
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2950 for abs in dsadded:
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2951 if repo.dirstate[abs] != 'a':
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2952 added.add(abs)
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2953 dsadded -= added
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	2954
22490 bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	2955 for abs in deladded:
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2956 if repo.dirstate[abs] == 'a':
22490 bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	2957 dsadded.add(abs)
bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	2958 deladded -= dsadded
bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	2959
22396 c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2960 # For files marked as removed, we check if an unknown file is present at
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2961 # the same path. If a such file exists it may need to be backed up.
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2962 # Making the distinction at this stage helps have simpler backup
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2963 # logic.
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2964 removunk = set()
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2965 for abs in removed:
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2966 target = repo.wjoin(abs)
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2967 if os.path.lexists(target):
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2968 removunk.add(abs)
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2969 removed -= removunk
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2970
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2971 dsremovunk = set()
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2972 for abs in dsremoved:
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2973 target = repo.wjoin(abs)
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2974 if os.path.lexists(target):
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2975 dsremovunk.add(abs)
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	2976 dsremoved -= dsremovunk
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2977
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2978 # action to be actually performed by revert
8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	2979 # (<list of file>, message>) tuple
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	2980 actions = {'revert': ([], _('reverting %s\n')),
33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	2981 'add': ([], _('adding %s\n')),
22489 0d57bf80c7cb revert: have an explicit action for "forget" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22488 diff changeset	2982 'remove': ([], _('removing %s\n')),
22491 5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	2983 'drop': ([], _('removing %s\n')),
22489 0d57bf80c7cb revert: have an explicit action for "forget" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22488 diff changeset	2984 'forget': ([], _('forgetting %s\n')),
22231 10d9e7908a3c revert: use actions[...] in all disptable cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 22230 diff changeset	2985 'undelete': ([], _('undeleting %s\n')),
22234 fe9fc29ac2d0 revert: add a message to noop action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22233 diff changeset	2986 'noop': (None, _('no changes needed to %s\n')),
22236 3c24fb96900f revert: handle unknown files through status Pierre-Yves David <pierre-yves.david@fb.com> parents: 22235 diff changeset	2987 'unknown': (None, _('file not managed: %s\n')),
22231 10d9e7908a3c revert: use actions[...] in all disptable cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 22230 diff changeset	2988 }
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2989
22608 bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	2990 # "constant" that convey the backup strategy.
bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	2991 # All set to `discard` if `no-backup` is set do avoid checking
bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	2992 # no_backup lower in the code.
22609 3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	2993 # These values are ordered for comparison purposes
22608 bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	2994 backup = 2 # unconditionally do backup
22609 3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	2995 check = 1 # check if the existing file differs from target
22608 bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	2996 discard = 0 # never do backup
bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	2997 if opts.get('no_backup'):
22609 3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	2998 backup = check = discard
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	2999
22611 2ff28e07d7d6 revert: properly back up added files with local modification Pierre-Yves David <pierre-yves.david@fb.com> parents: 22610 diff changeset	3000 backupanddel = actions['remove']
2ff28e07d7d6 revert: properly back up added files with local modification Pierre-Yves David <pierre-yves.david@fb.com> parents: 22610 diff changeset	3001 if not opts.get('no_backup'):
2ff28e07d7d6 revert: properly back up added files with local modification Pierre-Yves David <pierre-yves.david@fb.com> parents: 22610 diff changeset	3002 backupanddel = actions['drop']
2ff28e07d7d6 revert: properly back up added files with local modification Pierre-Yves David <pierre-yves.david@fb.com> parents: 22610 diff changeset	3003
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3004 disptable = (
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3005 # dispatch table:
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3006 # file state
22153 fc8bc2787528 revert: move manifest membership condition outside of the loop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22013 diff changeset	3007 # action
fc8bc2787528 revert: move manifest membership condition outside of the loop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22013 diff changeset	3008 # make backup
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3009
81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3010 ## Sets that results that will change file on disk
81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3011 # Modified compared to target, no local change
22372 8da5864dcfda revert: add more padding in the dispatch list Pierre-Yves David <pierre-yves.david@fb.com> parents: 22371 diff changeset	3012 (modified, actions['revert'], discard),
22397 1db04829bdc1 revert: distinguish between deleted file and locally modified Pierre-Yves David <pierre-yves.david@fb.com> parents: 22396 diff changeset	3013 # Modified compared to target, but local file is deleted
1db04829bdc1 revert: distinguish between deleted file and locally modified Pierre-Yves David <pierre-yves.david@fb.com> parents: 22396 diff changeset	3014 (deleted, actions['revert'], discard),
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3015 # Modified compared to target, local change
22372 8da5864dcfda revert: add more padding in the dispatch list Pierre-Yves David <pierre-yves.david@fb.com> parents: 22371 diff changeset	3016 (dsmodified, actions['revert'], backup),
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3017 # Added since target
22488 6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	3018 (added, actions['remove'], discard),
6c52ed3f888e revert: split between newly added file and file added in other changeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 22485 diff changeset	3019 # Added in working directory
22489 0d57bf80c7cb revert: have an explicit action for "forget" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22488 diff changeset	3020 (dsadded, actions['forget'], discard),
22610 0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	3021 # Added since target, have local modification
22611 2ff28e07d7d6 revert: properly back up added files with local modification Pierre-Yves David <pierre-yves.david@fb.com> parents: 22610 diff changeset	3022 (modadded, backupanddel, backup),
22490 bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	3023 # Added since target but file is missing in working directory
22491 5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	3024 (deladded, actions['drop'], discard),
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3025 # Removed since target, before working copy parent
22396 c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	3026 (removed, actions['add'], discard),
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	3027 # Same as `removed` but an unknown file exists at the same path
22609 3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3028 (removunk, actions['add'], check),
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3029 # Removed since targe, marked as such in working copy parent
22396 c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	3030 (dsremoved, actions['undelete'], discard),
c0213f2cb942 revert: detect unknown files in the same path as files marked as removed Pierre-Yves David <pierre-yves.david@fb.com> parents: 22395 diff changeset	3031 # Same as `dsremoved` but an unknown file exists at the same path
22609 3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3032 (dsremovunk, actions['undelete'], check),
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3033 ## the following sets does not result in any file changes
81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3034 # File with no modification
22372 8da5864dcfda revert: add more padding in the dispatch list Pierre-Yves David <pierre-yves.david@fb.com> parents: 22371 diff changeset	3035 (clean, actions['noop'], discard),
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3036 # Existing file, not tracked anywhere
22372 8da5864dcfda revert: add more padding in the dispatch list Pierre-Yves David <pierre-yves.david@fb.com> parents: 22371 diff changeset	3037 (unknown, actions['unknown'], discard),
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3038 )
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3039
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3040 for abs, (rel, exact) in sorted(names.items()):
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3041 # target file to be touch on disk (relative to cwd)
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3042 target = repo.wjoin(abs)
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3043 # search the entry in the dispatch table.
22212 f18aca03ddd9 revert: inline a now useless closure Pierre-Yves David <pierre-yves.david@fb.com> parents: 22211 diff changeset	3044 # if the file is in any of these sets, it was touched in the working
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3045 # directory parent and we are sure it needs to be reverted.
22232 91df98701e9e revert: explode the action tuple in the for loop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22231 diff changeset	3046 for table, (xlist, msg), dobackup in disptable:
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3047 if abs not in table:
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3048 continue
22233 4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3049 if xlist is not None:
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3050 xlist.append(abs)
22609 3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3051 if dobackup and (backup <= dobackup
3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3052 or wctx[abs].cmp(ctx[abs])):
3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3053 bakname = "%s.orig" % rel
3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3054 ui.note(_('saving current version of %s as %s\n') %
3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3055 (rel, bakname))
3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3056 if not opts.get('dry_run'):
24475 06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3057 if interactive:
06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3058 util.copyfile(target, bakname)
06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3059 else:
06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3060 util.rename(target, bakname)
22233 4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3061 if ui.verbose or not exact:
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3062 if not isinstance(msg, basestring):
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3063 msg = msg(abs)
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3064 ui.status(msg % rel)
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3065 elif exact:
22234 fe9fc29ac2d0 revert: add a message to noop action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22233 diff changeset	3066 ui.warn(msg % rel)
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3067 break
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3068
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3069 if not opts.get('dry_run'):
23965 6156edaa82aa revert: move prefetch to after the actions logic Durham Goode <durham@fb.com> parents: 23955 diff changeset	3070 needdata = ('revert', 'add', 'undelete')
6156edaa82aa revert: move prefetch to after the actions logic Durham Goode <durham@fb.com> parents: 23955 diff changeset	3071 _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3072 _performrevert(repo, parents, ctx, actions, interactive)
19129 bd19587a3347 revert: ensure that copies and renames are honored (issue3920) Bryan O'Sullivan <bryano@fb.com> parents: 19024 diff changeset	3073
24134 afed5d2e7985 revert: display full subrepo output with --dry-run Matt Harbison <matt_harbison@yahoo.com> parents: 24064 diff changeset	3074 if targetsubs:
afed5d2e7985 revert: display full subrepo output with --dry-run Matt Harbison <matt_harbison@yahoo.com> parents: 24064 diff changeset	3075 # Revert the subrepos on the revert list
afed5d2e7985 revert: display full subrepo output with --dry-run Matt Harbison <matt_harbison@yahoo.com> parents: 24064 diff changeset	3076 for sub in targetsubs:
24463 06d199e66bbc revert: handle subrepos missing in the given --rev Matt Harbison <matt_harbison@yahoo.com> parents: 24455 diff changeset	3077 try:
24464 30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24463 diff changeset	3078 wctx.sub(sub).revert(ctx.substate[sub], pats, *opts)
24463 06d199e66bbc revert: handle subrepos missing in the given --rev Matt Harbison <matt_harbison@yahoo.com> parents: 24455 diff changeset	3079 except KeyError:
06d199e66bbc revert: handle subrepos missing in the given --rev Matt Harbison <matt_harbison@yahoo.com> parents: 24455 diff changeset	3080 raise util.Abort("subrepository '%s' does not exist in %s!"
06d199e66bbc revert: handle subrepos missing in the given --rev Matt Harbison <matt_harbison@yahoo.com> parents: 24455 diff changeset	3081 % (sub, short(ctx.node())))
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3082 finally:
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3083 wlock.release()
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3084
22370 45e02cfad4bd revert: add a way for external extensions to prefetch file data Pierre-Yves David <pierre-yves.david@fb.com> parents: 22305 diff changeset	3085 def _revertprefetch(repo, ctx, *files):
45e02cfad4bd revert: add a way for external extensions to prefetch file data Pierre-Yves David <pierre-yves.david@fb.com> parents: 22305 diff changeset	3086 """Let extension changing the storage layer prefetch content"""
45e02cfad4bd revert: add a way for external extensions to prefetch file data Pierre-Yves David <pierre-yves.david@fb.com> parents: 22305 diff changeset	3087 pass
45e02cfad4bd revert: add a way for external extensions to prefetch file data Pierre-Yves David <pierre-yves.david@fb.com> parents: 22305 diff changeset	3088
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3089 def _performrevert(repo, parents, ctx, actions, interactive=False):
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3090 """function that actually perform all the actions computed for revert
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3091
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3092 This is an independent function to let extension to plug in and react to
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3093 the imminent revert.
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3094
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20790 diff changeset	3095 Make sure you have the working directory locked when calling this function.
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3096 """
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3097 parent, p2 = parents
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3098 node = ctx.node()
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3099 def checkout(f):
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3100 fc = ctx[f]
25755 72d395e399c1 cmdutil: remove useless dirstate.normallookup() invocation in revert() FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25739 diff changeset	3101 repo.wwrite(f, fc.data(), fc.flags())
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3102
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3103 audit_path = pathutil.pathauditor(repo.root)
22489 0d57bf80c7cb revert: have an explicit action for "forget" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22488 diff changeset	3104 for f in actions['forget'][0]:
0d57bf80c7cb revert: have an explicit action for "forget" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22488 diff changeset	3105 repo.dirstate.drop(f)
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3106 for f in actions['remove'][0]:
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3107 audit_path(f)
24857 d8505bfe4825 revert: restore the ability to revert across case only renames (issue4481) Matt Harbison <matt_harbison@yahoo.com> parents: 24845 diff changeset	3108 try:
d8505bfe4825 revert: restore the ability to revert across case only renames (issue4481) Matt Harbison <matt_harbison@yahoo.com> parents: 24845 diff changeset	3109 util.unlinkpath(repo.wjoin(f))
d8505bfe4825 revert: restore the ability to revert across case only renames (issue4481) Matt Harbison <matt_harbison@yahoo.com> parents: 24845 diff changeset	3110 except OSError:
d8505bfe4825 revert: restore the ability to revert across case only renames (issue4481) Matt Harbison <matt_harbison@yahoo.com> parents: 24845 diff changeset	3111 pass
22491 5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	3112 repo.dirstate.remove(f)
5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	3113 for f in actions['drop'][0]:
5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	3114 audit_path(f)
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3115 repo.dirstate.remove(f)
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3116
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3117 normal = None
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3118 if node == parent:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3119 # We're reverting to our parent. If possible, we'd like status
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3120 # to report the file as clean. We have to use normallookup for
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3121 # merges to avoid losing information about merged/dirty files.
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3122 if p2 != nullid:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3123 normal = repo.dirstate.normallookup
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3124 else:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3125 normal = repo.dirstate.normal
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3126
25259 5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3127 newlyaddedandmodifiedfiles = set()
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3128 if interactive:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3129 # Prompt the user for changes to revert
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3130 torevert = [repo.wjoin(f) for f in actions['revert'][0]]
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3131 m = scmutil.match(ctx, torevert, {})
25258 f37a69ec3f47 revert: make revert --interactive use git style diff Laurent Charignon <lcharignon@fb.com> parents: 25257 diff changeset	3132 diffopts = patch.difffeatureopts(repo.ui, whitespace=True)
f37a69ec3f47 revert: make revert --interactive use git style diff Laurent Charignon <lcharignon@fb.com> parents: 25257 diff changeset	3133 diffopts.nodates = True
f37a69ec3f47 revert: make revert --interactive use git style diff Laurent Charignon <lcharignon@fb.com> parents: 25257 diff changeset	3134 diffopts.git = True
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3135 reversehunks = repo.ui.configbool('experimental',
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3136 'revertalternateinteractivemode',
25657 dcc56e10c23b revert: change the direction of revert -i Laurent Charignon <lcharignon@fb.com> parents: 25511 diff changeset	3137 True)
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3138 if reversehunks:
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3139 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3140 else:
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3141 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3142 originalchunks = patch.parsepatch(diff)
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3143
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3144 try:
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3145
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3146 chunks = recordfilter(repo.ui, originalchunks)
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3147 if reversehunks:
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3148 chunks = patch.reversehunks(chunks)
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3149
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	3150 except patch.PatchError as err:
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3151 raise util.Abort(_('error parsing patch: %s') % err)
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3152
25259 5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3153 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3154 # Apply changes
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3155 fp = cStringIO.StringIO()
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3156 for c in chunks:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3157 c.write(fp)
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3158 dopatch = fp.tell()
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3159 fp.seek(0)
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3160 if dopatch:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3161 try:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3162 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	3163 except patch.PatchError as err:
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3164 raise util.Abort(str(err))
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3165 del fp
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3166 else:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3167 for f in actions['revert'][0]:
25755 72d395e399c1 cmdutil: remove useless dirstate.normallookup() invocation in revert() FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25739 diff changeset	3168 checkout(f)
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3169 if normal:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3170 normal(f)
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3171
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3172 for f in actions['add'][0]:
25259 5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3173 # Don't checkout modified files, they are already created by the diff
5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3174 if f not in newlyaddedandmodifiedfiles:
5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3175 checkout(f)
5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3176 repo.dirstate.add(f)
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3177
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3178 normal = repo.dirstate.normallookup
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3179 if node == parent and p2 == nullid:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3180 normal = repo.dirstate.normal
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3181 for f in actions['undelete'][0]:
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3182 checkout(f)
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3183 normal(f)
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3184
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3185 copied = copies.pathcopies(repo[parent], ctx)
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3186
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3187 for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]:
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3188 if f in copied:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3189 repo.dirstate.copy(copied[f], f)
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3190
14297 2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3191 def command(table):
21766 a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3192 """Returns a function object to be used as a decorator for making commands.
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3193
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3194 This function receives a command table as its argument. The table should
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3195 be a dict.
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3196
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3197 The returned function can be used as a decorator for adding commands
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3198 to that command table. This function accepts multiple arguments to define
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3199 a command.
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3200
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3201 The first argument is the command name.
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3202
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3203 The options argument is an iterable of tuples defining command arguments.
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3204 See ``mercurial.fancyopts.fancyopts()`` for the format of each tuple.
14297 2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3205
21766 a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3206 The synopsis argument defines a short, one line summary of how to use the
a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3207 command. This shows up in the help output.
21767 75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3208
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3209 The norepo argument defines whether the command does not require a
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3210 local repository. Most commands operate against a repository, thus the
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3211 default is False.
21774 b280d0b60bc3 cmdutil: add optionalrepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21767 diff changeset	3212
b280d0b60bc3 cmdutil: add optionalrepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21767 diff changeset	3213 The optionalrepo argument defines whether the command optionally requires
b280d0b60bc3 cmdutil: add optionalrepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21767 diff changeset	3214 a local repository.
21777 17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3215
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3216 The inferrepo argument defines whether to try to find a repository from the
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3217 command line arguments. If True, arguments will be examined for potential
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3218 repository locations. See ``findrepo()``. If a repository is found, it
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3219 will be used.
21766 a039e1f2326f cmdutil: better document command() Gregory Szorc <gregory.szorc@gmail.com> parents: 21689 diff changeset	3220 """
21777 17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3221 def cmd(name, options=(), synopsis=None, norepo=False, optionalrepo=False,
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3222 inferrepo=False):
14297 2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3223 def decorator(func):
2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3224 if synopsis:
18235 9807e7d596c3 cmdutil: make options argument optional Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18206 diff changeset	3225 table[name] = func, list(options), synopsis
14297 2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3226 else:
18235 9807e7d596c3 cmdutil: make options argument optional Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18206 diff changeset	3227 table[name] = func, list(options)
21767 75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3228
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3229 if norepo:
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3230 # Avoid import cycle.
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3231 import commands
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3232 commands.norepo += ' %s' % ' '.join(parsealiases(name))
75a96326cecb commands: add norepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21766 diff changeset	3233
21774 b280d0b60bc3 cmdutil: add optionalrepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21767 diff changeset	3234 if optionalrepo:
b280d0b60bc3 cmdutil: add optionalrepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21767 diff changeset	3235 import commands
b280d0b60bc3 cmdutil: add optionalrepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21767 diff changeset	3236 commands.optionalrepo += ' %s' % ' '.join(parsealiases(name))
b280d0b60bc3 cmdutil: add optionalrepo argument to command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21767 diff changeset	3237
21777 17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3238 if inferrepo:
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3239 import commands
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3240 commands.inferrepo += ' %s' % ' '.join(parsealiases(name))
17d1ac452127 cmdutil: support inferrepo in command decorator Gregory Szorc <gregory.szorc@gmail.com> parents: 21774 diff changeset	3241
14297 2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3242 return func
2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3243 return decorator
2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3244
2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3245 return cmd
19211 3bfd7f1e7485 summary: augment output with info from extensions Bryan O'Sullivan <bryano@fb.com> parents: 19129 diff changeset	3246
21051 1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3247 # a list of (ui, repo, otherpeer, opts, missing) functions called by
1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3248 # commands.outgoing. "missing" is "missing" of the result of
1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3249 # "findcommonoutgoing()"
1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3250 outgoinghooks = util.hooks()
1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3251
19211 3bfd7f1e7485 summary: augment output with info from extensions Bryan O'Sullivan <bryano@fb.com> parents: 19129 diff changeset	3252 # a list of (ui, repo) functions called by commands.summary
3bfd7f1e7485 summary: augment output with info from extensions Bryan O'Sullivan <bryano@fb.com> parents: 19129 diff changeset	3253 summaryhooks = util.hooks()
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3254
21047 f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3255 # a list of (ui, repo, opts, changes) functions called by commands.summary.
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3256 #
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3257 # functions should return tuple of booleans below, if 'changes' is None:
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3258 # (whether-incomings-are-needed, whether-outgoings-are-needed)
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3259 #
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3260 # otherwise, 'changes' is a tuple of tuples below:
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3261 # - (sourceurl, sourcebranch, sourcepeer, incoming)
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3262 # - (desturl, destbranch, destpeer, outgoing)
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3263 summaryremotehooks = util.hooks()
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3264
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3265 # A list of state files kept by multistep operations like graft.
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3266 # Since graft cannot be aborted, it is considered 'clearable' by update.
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3267 # note: bisect is intentionally excluded
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3268 # (state file, clearable, allowcommit, error, hint)
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3269 unfinishedstates = [
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3270 ('graftstate', True, False, _('graft in progress'),
19482 499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19474 diff changeset	3271 _("use 'hg graft --continue' or 'hg update' to abort")),
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3272 ('updatestate', True, False, _('last update was interrupted'),
19482 499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19474 diff changeset	3273 _("use 'hg update' to get a consistent checkout"))
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3274 ]
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3275
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3276 def checkunfinished(repo, commit=False):
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3277 '''Look for an unfinished multistep operation, like graft, and abort
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3278 if found. It's probably good to check this right before
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3279 bailifchanged().
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3280 '''
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3281 for f, clearable, allowcommit, msg, hint in unfinishedstates:
607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3282 if commit and allowcommit:
607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3283 continue
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3284 if repo.vfs.exists(f):
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3285 raise util.Abort(msg, hint=hint)
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3286
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3287 def clearunfinished(repo):
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3288 '''Check for unfinished operations (as above), and clear the ones
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3289 that are clearable.
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3290 '''
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3291 for f, clearable, allowcommit, msg, hint in unfinishedstates:
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3292 if not clearable and repo.vfs.exists(f):
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3293 raise util.Abort(msg, hint=hint)
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3294 for f, clearable, allowcommit, msg, hint in unfinishedstates:
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3295 if clearable and repo.vfs.exists(f):
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3296 util.unlink(repo.join(f))
24991 4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3297
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3298 class dirstateguard(object):
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3299 '''Restore dirstate at unexpected failure.
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3300
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3301 At the construction, this class does:
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3302
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3303 - write current ``repo.dirstate`` out, and
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3304 - save ``.hg/dirstate`` into the backup file
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3305
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3306 This restores ``.hg/dirstate`` from backup file, if ``release()``
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3307 is invoked before ``close()``.
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3308
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3309 This just removes the backup file at ``close()`` before ``release()``.
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3310 '''
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3311
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3312 def __init__(self, repo, name):
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3313 repo.dirstate.write()
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3314 self._repo = repo
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3315 self._filename = 'dirstate.backup.%s.%d' % (name, id(self))
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3316 repo.vfs.write(self._filename, repo.vfs.tryread('dirstate'))
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3317 self._active = True
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3318 self._closed = False
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3319
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3320 def __del__(self):
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3321 if self._active: # still active
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3322 # this may occur, even if this class is used correctly:
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3323 # for example, releasing other resources like transaction
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3324 # may raise exception before ``dirstateguard.release`` in
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3325 # ``release(tr, ....)``.
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3326 self._abort()
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3327
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3328 def close(self):
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3329 if not self._active: # already inactivated
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3330 msg = (_("can't close already inactivated backup: %s")
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3331 % self._filename)
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3332 raise util.Abort(msg)
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3333
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3334 self._repo.vfs.unlink(self._filename)
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3335 self._active = False
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3336 self._closed = True
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3337
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3338 def _abort(self):
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3339 # this "invalidate()" prevents "wlock.release()" from writing
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3340 # changes of dirstate out after restoring to original status
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3341 self._repo.dirstate.invalidate()
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3342
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3343 self._repo.vfs.rename(self._filename, 'dirstate')
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3344 self._active = False
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3345
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3346 def release(self):
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3347 if not self._closed:
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3348 if not self._active: # already inactivated
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3349 msg = (_("can't release already inactivated backup: %s")
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3350 % self._filename)
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3351 raise util.Abort(msg)
4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3352 self._abort()
26510 77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3353
26531 15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3354 _bundlecompspecs = {'none': None,
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3355 'bzip2': 'BZ',
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3356 'gzip': 'GZ',
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3357 }
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3358
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3359 _bundleversionspecs = {'v1': '01',
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3360 'v2': '02',
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3361 'bundle2': '02', #legacy
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3362 }
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3363
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3364 def parsebundletype(repo, spec):
26510 77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3365 """return the internal bundle type to use from a user input
77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3366
77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3367 This is parsing user specified bundle type as accepted in:
77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3368
77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3369 'hg bundle --type TYPE'.
26531 15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3370
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3371 It accept format in the form [compression][-version]\|[version]
26532 1d1d0914cb76 parsebundletype: add a comment for future generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 26531 diff changeset	3372
1d1d0914cb76 parsebundletype: add a comment for future generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 26531 diff changeset	3373 Consensus about extensions of the format for various bundle2 feature
1d1d0914cb76 parsebundletype: add a comment for future generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 26531 diff changeset	3374 is to prefix any feature with "+". eg "+treemanifest" or "gzip+phases"
26510 77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3375 """
26531 15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3376 comp, version = None, None
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3377
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3378 if '-' in spec:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3379 comp, version = spec.split('-', 1)
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3380 elif spec in _bundlecompspecs:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3381 comp = spec
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3382 elif spec in _bundleversionspecs:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3383 version = spec
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3384 else:
26510 77c13f3c01ca bundle: extract the parsing of the bundle type in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26435 diff changeset	3385 raise util.Abort(_('unknown bundle type specified with --type'))
26531 15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3386
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3387 if comp is None:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3388 comp = 'BZ'
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3389 else:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3390 try:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3391 comp = _bundlecompspecs[comp]
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3392 except KeyError:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3393 raise util.Abort(_('unknown bundle type specified with --type'))
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3394
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3395 if version is None:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3396 version = '01'
26533 3e61b325e79a bundle: use bundle2 if repository uses general delta Pierre-Yves David <pierre-yves.david@fb.com> parents: 26532 diff changeset	3397 if 'generaldelta' in repo.requirements:
3e61b325e79a bundle: use bundle2 if repository uses general delta Pierre-Yves David <pierre-yves.david@fb.com> parents: 26532 diff changeset	3398 version = '02'
26531 15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3399 else:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3400 try:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3401 version = _bundleversionspecs[version]
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3402 except KeyError:
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3403 raise util.Abort(_('unknown bundle type specified with --type'))
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3404
15ce78517d4b bundle: extend the format of --type to support version and compression Pierre-Yves David <pierre-yves.david@fb.com> parents: 26510 diff changeset	3405 return version, comp

Mercurial > public > mercurial-scm > hg

annotate mercurial/cmdutil.py @ 26547:b9be8ab6e628