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

annotate mercurial/cmdutil.py @ 34189:e9898ad31115

cmdutil: allow extra properties to be added to each context The changeset displayer allows setting extra keywords to be available to the templating layer. This patch adds an argument to displaygraph() to pass a dict of extra properties to be available to every changeset. Differential Revision: https://phab.mercurial-scm.org/D555

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 03 Aug 2017 21:13:27 -0700
parents	ae95853c250a
children	61714510220d

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
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	8 from __future__ import absolute_import
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	9
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	10 import errno
31807 e6eb86b154c5 templater: provide loop counter as "index" keyword Yuya Nishihara <yuya@tcha.org> parents: 31698 diff changeset	11 import itertools
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	12 import os
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	13 import re
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	14 import tempfile
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	15
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	16 from .i18n import _
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	17 from .node import (
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	18 hex,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	19 nullid,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	20 nullrev,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	21 short,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	22 )
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	23
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	24 from . import (
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	25 bookmarks,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	26 changelog,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	27 copies,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	28 crecord as crecordmod,
33617 5ac845ca059a commit: don't let failed commit with --addremove update dirstate (issue5645) Martin von Zweigbergk <martinvonz@google.com> parents: 33548 diff changeset	29 dirstateguard,
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	30 encoding,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	31 error,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	32 formatter,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	33 graphmod,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	34 match as matchmod,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	35 obsolete,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	36 patch,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	37 pathutil,
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30506 diff changeset	38 pycompat,
32337 46ba2cdda476 registrar: move cmdutil.command to registrar module (API) Yuya Nishihara <yuya@tcha.org> parents: 32327 diff changeset	39 registrar,
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	40 revlog,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	41 revset,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	42 scmutil,
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30877 diff changeset	43 smartset,
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	44 templatekw,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	45 templater,
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	46 util,
31237 1b08aca7870a vfs: use 'vfs' module directly in 'mercurial.cmdutil' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31216 diff changeset	47 vfs as vfsmod,
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	48 )
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28837 diff changeset	49 stringio = util.stringio
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	50
32375 04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	51 # templates of common command options
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	52
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	53 dryrunopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	54 ('n', 'dry-run', None,
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	55 _('do not perform actions, just print output')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	56 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	57
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	58 remoteopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	59 ('e', 'ssh', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	60 _('specify ssh command to use'), _('CMD')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	61 ('', 'remotecmd', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	62 _('specify hg command to run on the remote side'), _('CMD')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	63 ('', 'insecure', None,
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	64 _('do not verify server certificate (ignoring web.cacerts config)')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	65 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	66
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	67 walkopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	68 ('I', 'include', [],
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	69 _('include names matching the given patterns'), _('PATTERN')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	70 ('X', 'exclude', [],
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	71 _('exclude names matching the given patterns'), _('PATTERN')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	72 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	73
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	74 commitopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	75 ('m', 'message', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	76 _('use text as commit message'), _('TEXT')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	77 ('l', 'logfile', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	78 _('read commit message from file'), _('FILE')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	79 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	80
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	81 commitopts2 = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	82 ('d', 'date', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	83 _('record the specified date as commit date'), _('DATE')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	84 ('u', 'user', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	85 _('record the specified user as committer'), _('USER')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	86 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	87
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	88 # hidden for now
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	89 formatteropts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	90 ('T', 'template', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	91 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	92 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	93
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	94 templateopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	95 ('', 'style', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	96 _('display using template map file (DEPRECATED)'), _('STYLE')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	97 ('T', 'template', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	98 _('display with template'), _('TEMPLATE')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	99 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	100
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	101 logopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	102 ('p', 'patch', None, _('show patch')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	103 ('g', 'git', None, _('use git extended diff format')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	104 ('l', 'limit', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	105 _('limit number of changes displayed'), _('NUM')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	106 ('M', 'no-merges', None, _('do not show merges')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	107 ('', 'stat', None, _('output diffstat-style summary of changes')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	108 ('G', 'graph', None, _("show the revision DAG")),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	109 ] + templateopts
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	110
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	111 diffopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	112 ('a', 'text', None, _('treat all files as text')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	113 ('g', 'git', None, _('use git extended diff format')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	114 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	115 ('', 'nodates', None, _('omit dates from diff headers'))
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	116 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	117
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	118 diffwsopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	119 ('w', 'ignore-all-space', None,
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	120 _('ignore white space when comparing lines')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	121 ('b', 'ignore-space-change', None,
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	122 _('ignore changes in the amount of white space')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	123 ('B', 'ignore-blank-lines', None,
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	124 _('ignore changes whose lines are all blank')),
34013 da07367d683b mdiff: add a --ignore-space-at-eol option David Soria Parra <davidsp@fb.com> parents: 34001 diff changeset	125 ('Z', 'ignore-space-at-eol', None,
da07367d683b mdiff: add a --ignore-space-at-eol option David Soria Parra <davidsp@fb.com> parents: 34001 diff changeset	126 _('ignore changes in whitespace at EOL')),
32375 04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	127 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	128
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	129 diffopts2 = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	130 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	131 ('p', 'show-function', None, _('show which function each change is in')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	132 ('', 'reverse', None, _('produce a diff that undoes the changes')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	133 ] + diffwsopts + [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	134 ('U', 'unified', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	135 _('number of lines of context to show'), _('NUM')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	136 ('', 'stat', None, _('output diffstat-style summary of changes')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	137 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	138 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	139
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	140 mergetoolopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	141 ('t', 'tool', '', _('specify merge tool')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	142 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	143
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	144 similarityopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	145 ('s', 'similarity', '',
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	146 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	147 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	148
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	149 subrepoopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	150 ('S', 'subrepos', None,
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	151 _('recurse into subrepositories'))
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	152 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	153
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	154 debugrevlogopts = [
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	155 ('c', 'changelog', False, _('open changelog')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	156 ('m', 'manifest', False, _('open manifest')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	157 ('', 'dir', '', _('open directory manifest')),
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	158 ]
04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32362 diff changeset	159
30703 5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	160 # special string such that everything below this line will be ingored in the
5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	161 # editor text
5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	162 _linebelow = "^HG: ------------------------ >8 ------------------------$"
5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	163
25256 5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	164 def ishunk(x):
5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	165 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	166 return isinstance(x, hunkclasses)
5a8398b085ed record: extract ishunk to a function Laurent Charignon <lcharignon@fb.com> parents: 25228 diff changeset	167
25257 07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	168 def newandmodified(chunks, originalchunks):
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	169 newlyaddedandmodifiedfiles = set()
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	170 for chunk in chunks:
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	171 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	172 originalchunks:
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	173 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	174 return newlyaddedandmodifiedfiles
07326d76f19d record: extract code to compute newly added and modified files Laurent Charignon <lcharignon@fb.com> parents: 25256 diff changeset	175
10401 6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	176 def parsealiases(cmd):
6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	177 return cmd.lstrip("^").split("\|")
6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	178
24356 a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	179 def setupwrapcolorwrite(ui):
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	180 # 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	181 def wrapwrite(orig, args, *kw):
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	182 label = kw.pop('label', '')
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	183 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	184 orig(chunk, label=label + l)
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	185
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	186 oldwrite = ui.write
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	187 def wrap(args, *kwargs):
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	188 return wrapwrite(oldwrite, args, *kwargs)
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	189 setattr(ui, 'write', wrap)
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	190 return oldwrite
a38f384f2a57 record: consolidate ui.write wrapping in a function Laurent Charignon <lcharignon@fb.com> parents: 24345 diff changeset	191
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	192 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	193 if usecurses:
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	194 if testfile:
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	195 recordfn = crecordmod.testdecorator(testfile,
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	196 crecordmod.testchunkselector)
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	197 else:
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	198 recordfn = crecordmod.chunkselector
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	199
30534 c01033fb9864 revert: pass operation to crecord Jun Wu <quark@fb.com> parents: 30532 diff changeset	200 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	201
69538481ea9f record: enable curses recording logic with experimental flag Laurent Charignon <lcharignon@fb.com> parents: 24341 diff changeset	202 else:
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	203 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	204
c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	205 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	206 """ 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	207 selected hunks.
29326 d48fc6f318a3 patch: define full messages for interactive record/revert Denis Laxalde <denis.laxalde@logilab.fr> parents: 29283 diff changeset	208 operation is used for to build ui messages to indicate the user what
d48fc6f318a3 patch: define full messages for interactive record/revert Denis Laxalde <denis.laxalde@logilab.fr> parents: 29283 diff changeset	209 kind of filtering they are doing: reverting, committing, shelving, etc.
d48fc6f318a3 patch: define full messages for interactive record/revert Denis Laxalde <denis.laxalde@logilab.fr> parents: 29283 diff changeset	210 (see patch.filterpatch).
25310 c1f5ef76d1c2 record: add an operation arguments to customize recording ui Laurent Charignon <lcharignon@fb.com> parents: 25273 diff changeset	211 """
27531 84d686cb62c4 cmdutil: use crecordmod.checkcurses Sean Farley <sean@farley.io> parents: 27370 diff changeset	212 usecurses = crecordmod.checkcurses(ui)
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33438 diff changeset	213 testfile = ui.config('experimental', 'crecordtest')
24358 8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	214 oldwrite = setupwrapcolorwrite(ui)
8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	215 try:
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 27148 diff changeset	216 newchunks, newopts = filterchunks(ui, originalhunks, usecurses,
8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 27148 diff changeset	217 testfile, operation)
24358 8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	218 finally:
8d9e9063b040 record: move ui.write wrapping where it should be Laurent Charignon <lcharignon@fb.com> parents: 24357 diff changeset	219 ui.write = oldwrite
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 27148 diff changeset	220 return newchunks, newopts
24357 2da601ab3125 record: refactor the filtering code Laurent Charignon <lcharignon@fb.com> parents: 24356 diff changeset	221
24309 fefcafda10b8 record: change interface of dorecord to accept new filters Laurent Charignon <lcharignon@fb.com> parents: 24306 diff changeset	222 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	223 filterfn, pats, *opts):
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	224 from . import merge as mergemod
32144 93155367a2a6 py3: convert opts to bytes in cmdutil.dorecord() Pulkit Goyal <7895pulkit@gmail.com> parents: 32046 diff changeset	225 opts = pycompat.byteskwargs(opts)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	226 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	227 if cmdsuggest:
69145daacdfa cmdutil: allow callers of cmdutil.dorecord to omit suggestion FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25763 diff changeset	228 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	229 else:
69145daacdfa cmdutil: allow callers of cmdutil.dorecord to omit suggestion FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25763 diff changeset	230 msg = _('running non-interactively')
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	231 raise error.Abort(msg)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	232
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	233 # 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	234 if not opts.get('user'):
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	235 ui.username() # raise exception, username not provided
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	236
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	237 def recordfunc(ui, repo, message, match, opts):
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	238 """This is generic record driver.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	239
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	240 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	241 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	242 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	243 'commit' or 'qrefresh'.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	244
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	245 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	246 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	247
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	248 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	249 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	250 """
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	251
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	252 checkunfinished(repo, commit=True)
28815 44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	253 wctx = repo[None]
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	254 merge = len(wctx.parents()) > 1
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	255 if merge:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	256 raise error.Abort(_('cannot partially commit a merge '
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	257 '(use "hg commit" instead)'))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	258
28815 44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	259 def fail(f, msg):
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	260 raise error.Abort('%s: %s' % (f, msg))
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	261
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	262 force = opts.get('force')
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	263 if not force:
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	264 vdirs = []
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	265 match.explicitdir = vdirs.append
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	266 match.bad = fail
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	267
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	268 status = repo.status(match=match)
28815 44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	269 if not force:
44611ad4fbd9 crecord: check for untracked arguments timeless <timeless@mozdev.org> parents: 28638 diff changeset	270 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	271 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	272 diffopts.nodates = True
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	273 diffopts.git = True
27411 c84a07530040 record: turn on showfunc timeless <timeless@mozdev.org> parents: 27391 diff changeset	274 diffopts.showfunc = True
27637 b502138f5faa cleanup: remove superfluous space after space after equals (python) timeless <timeless@mozdev.org> parents: 27625 diff changeset	275 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
24341 616c01b69898 record: change interface of the filtering function Laurent Charignon <lcharignon@fb.com> parents: 24311 diff changeset	276 originalchunks = patch.parsepatch(originaldiff)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	277
28570 5508cf9a52fe crecord: rewrite a comment about filtering patches Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28452 diff changeset	278 # 1. filter patch, since we are intending to apply subset of it
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	279 try:
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 27148 diff changeset	280 chunks, newopts = filterfn(ui, originalchunks)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	281 except patch.PatchError as err:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	282 raise error.Abort(_('error parsing patch: %s') % err)
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 27148 diff changeset	283 opts.update(newopts)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	284
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24843 diff changeset	285 # 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	286 # 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	287 # 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	288 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	289 contenders = set()
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	290 for h in chunks:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	291 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	292 contenders.update(set(h.files()))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	293 except AttributeError:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	294 pass
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	295
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	296 changed = status.modified + status.added + status.removed
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	297 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	298 if not newfiles:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	299 ui.status(_('no changes to record\n'))
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	300 return 0
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	301
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	302 modified = set(status.modified)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	303
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	304 # 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	305
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	306 if backupall:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	307 tobackup = changed
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	308 else:
24845 8133494accf1 record: edit patch of newly added files (issue4304) Laurent Charignon <lcharignon@fb.com> parents: 24843 diff changeset	309 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	310 newlyaddedandmodifiedfiles]
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	311 backups = {}
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	312 if tobackup:
31320 1b0db28dadf1 cmdutil: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31309 diff changeset	313 backupdir = repo.vfs.join('record-backups')
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	314 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	315 os.mkdir(backupdir)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	316 except OSError as err:
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	317 if err.errno != errno.EEXIST:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	318 raise
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	319 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	320 # backup continues
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	321 for f in tobackup:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	322 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	323 dir=backupdir)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	324 os.close(fd)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	325 ui.debug('backup %r as %r\n' % (f, tmpname))
27370 d9e3ebe56970 record: don't dereference symlinks while copying over stat data Siddharth Agarwal <sid0@fb.com> parents: 26781 diff changeset	326 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	327 backups[f] = tmpname
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	328
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28837 diff changeset	329 fp = stringio()
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	330 for c in chunks:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	331 fname = c.filename()
24837 edf907bd8144 record: fix record with change on moved file crashes (issue4619) Laurent Charignon <lcharignon@fb.com> parents: 24720 diff changeset	332 if fname in backups:
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	333 c.write(fp)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	334 dopatch = fp.tell()
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	335 fp.seek(0)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	336
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	337 # 2.5 optionally review / modify patch in text editor
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	338 if opts.get('review', False):
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	339 patchtext = (crecordmod.diffhelptext
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	340 + crecordmod.patchhelptext
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	341 + fp.read())
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	342 reviewedpatch = ui.edit(patchtext, "",
34029 6e6452bc441d editor: use an unambiguous path suffix for editor files Michael Bolin <mbolin@fb.com> parents: 34022 diff changeset	343 action="diff",
30848 7080652af6e6 ui: rename tmpdir parameter to more specific repopath Sean Farley <sean@farley.io> parents: 30836 diff changeset	344 repopath=repo.path)
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	345 fp.truncate(0)
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	346 fp.write(reviewedpatch)
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	347 fp.seek(0)
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28630 diff changeset	348
24866 e1ec3d075c67 record: fix adding new file with record from within a subdir (issue4626) Laurent Charignon <lcharignon@fb.com> parents: 24864 diff changeset	349 [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	350 # 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	351 if backups:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	352 # Equivalent to hg.revert
27344 43c00ca887d1 merge: have merge.update use a matcher instead of partial fn Augie Fackler <augie@google.com> parents: 27216 diff changeset	353 m = scmutil.matchfiles(repo, backups.keys())
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	354 mergemod.update(repo, repo.dirstate.p1(),
27344 43c00ca887d1 merge: have merge.update use a matcher instead of partial fn Augie Fackler <augie@google.com> parents: 27216 diff changeset	355 False, True, matcher=m)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	356
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	357 # 3b. (apply)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	358 if dopatch:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	359 try:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	360 ui.debug('applying patch\n')
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	361 ui.debug(fp.getvalue())
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	362 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	363 except patch.PatchError as err:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	364 raise error.Abort(str(err))
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	365 del fp
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	366
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	367 # 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	368 # 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	369 # commit/qrefresh or the like!
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	370
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	371 # Make all of the pathnames absolute.
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	372 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	373 return commitfunc(ui, repo, newfiles, *opts)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	374 finally:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	375 # 5. finally restore backed-up files
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	376 try:
25759 ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	377 dirstate = repo.dirstate
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	378 for realname, tmpname in backups.iteritems():
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	379 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	380
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	381 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	382 # 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	383 # 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	384 # 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	385 dirstate.normallookup(realname)
ff11c1565c04 cmdutil: apply dirstate.normallookup on (maybe partially) committed files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25758 diff changeset	386
27370 d9e3ebe56970 record: don't dereference symlinks while copying over stat data Siddharth Agarwal <sid0@fb.com> parents: 26781 diff changeset	387 # copystat=True here and above are a hack to trick any
d9e3ebe56970 record: don't dereference symlinks while copying over stat data Siddharth Agarwal <sid0@fb.com> parents: 26781 diff changeset	388 # editors that have f open that we haven't modified them.
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	389 #
27370 d9e3ebe56970 record: don't dereference symlinks while copying over stat data Siddharth Agarwal <sid0@fb.com> parents: 26781 diff changeset	390 # Also note that this racy as an editor could notice the
d9e3ebe56970 record: don't dereference symlinks while copying over stat data Siddharth Agarwal <sid0@fb.com> parents: 26781 diff changeset	391 # file's mtime before we've finished writing it.
d9e3ebe56970 record: don't dereference symlinks while copying over stat data Siddharth Agarwal <sid0@fb.com> parents: 26781 diff changeset	392 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
24272 26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	393 os.unlink(tmpname)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	394 if tobackup:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	395 os.rmdir(backupdir)
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	396 except OSError:
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	397 pass
26a1c617e047 record: move dorecord from record to cmdutil Laurent Charignon <lcharignon@fb.com> parents: 24260 diff changeset	398
25758 c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	399 def recordinwlock(ui, repo, message, match, opts):
27801 7be6371c732e with: use context manager for wlock in recordinwlock Bryan O'Sullivan <bryano@fb.com> parents: 27698 diff changeset	400 with repo.wlock():
25758 c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	401 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	402
c5dfa47ad7ee cmdutil: put recordfunc invocation into wlock scope for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25755 diff changeset	403 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	404
33548 4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	405 def tersestatus(root, statlist, status, ignorefn, ignore):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	406 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	407 Returns a list of statuses with directory collapsed if all the files in the
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	408 directory has the same status.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	409 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	410
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	411 def numfiles(dirname):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	412 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	413 Calculates the number of tracked files in a given directory which also
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	414 includes files which were removed or deleted. Considers ignored files
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	415 if ignore argument is True or 'i' is present in status argument.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	416 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	417 if lencache.get(dirname):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	418 return lencache[dirname]
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	419 if 'i' in status or ignore:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	420 def match(localpath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	421 absolutepath = os.path.join(root, localpath)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	422 if os.path.isdir(absolutepath) and isemptydir(absolutepath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	423 return True
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	424 return False
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	425 else:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	426 def match(localpath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	427 # there can be directory whose all the files are ignored and
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	428 # hence the drectory should also be ignored while counting
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	429 # number of files or subdirs in it's parent directory. This
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	430 # checks the same.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	431 # XXX: We need a better logic here.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	432 if os.path.isdir(os.path.join(root, localpath)):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	433 return isignoreddir(localpath)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	434 else:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	435 # XXX: there can be files which have the ignored pattern but
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	436 # are not ignored. That leads to bug in counting number of
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	437 # tracked files in the directory.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	438 return ignorefn(localpath)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	439 lendir = 0
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	440 abspath = os.path.join(root, dirname)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	441 # There might be cases when a directory does not exists as the whole
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	442 # directory can be removed and/or deleted.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	443 try:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	444 for f in os.listdir(abspath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	445 localpath = os.path.join(dirname, f)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	446 if not match(localpath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	447 lendir += 1
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	448 except OSError:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	449 pass
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	450 lendir += len(absentdir.get(dirname, []))
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	451 lencache[dirname] = lendir
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	452 return lendir
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	453
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	454 def isemptydir(abspath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	455 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	456 Check whether a directory is empty or not, i.e. there is no files in the
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	457 directory and all its subdirectories.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	458 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	459 for f in os.listdir(abspath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	460 fullpath = os.path.join(abspath, f)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	461 if os.path.isdir(fullpath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	462 # recursion here
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	463 ret = isemptydir(fullpath)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	464 if not ret:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	465 return False
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	466 else:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	467 return False
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	468 return True
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	469
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	470 def isignoreddir(localpath):
33694 93422d0068f8 status: avoid recursing into ignored directory with "--terse u" Denis Laxalde <denis.laxalde@logilab.fr> parents: 33666 diff changeset	471 """Return True if `localpath` directory is ignored or contains only
93422d0068f8 status: avoid recursing into ignored directory with "--terse u" Denis Laxalde <denis.laxalde@logilab.fr> parents: 33666 diff changeset	472 ignored files and should hence be considered ignored.
33548 4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	473 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	474 dirpath = os.path.join(root, localpath)
33694 93422d0068f8 status: avoid recursing into ignored directory with "--terse u" Denis Laxalde <denis.laxalde@logilab.fr> parents: 33666 diff changeset	475 if ignorefn(dirpath):
93422d0068f8 status: avoid recursing into ignored directory with "--terse u" Denis Laxalde <denis.laxalde@logilab.fr> parents: 33666 diff changeset	476 return True
33548 4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	477 for f in os.listdir(dirpath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	478 filepath = os.path.join(dirpath, f)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	479 if os.path.isdir(filepath):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	480 # recursion here
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	481 ret = isignoreddir(os.path.join(localpath, f))
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	482 if not ret:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	483 return False
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	484 else:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	485 if not ignorefn(os.path.join(localpath, f)):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	486 return False
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	487 return True
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	488
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	489 def absentones(removedfiles, missingfiles):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	490 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	491 Returns a dictionary of directories with files in it which are either
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	492 removed or missing (deleted) in them.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	493 """
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	494 absentdir = {}
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	495 absentfiles = removedfiles + missingfiles
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	496 while absentfiles:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	497 f = absentfiles.pop()
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	498 par = os.path.dirname(f)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	499 if par == '':
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	500 continue
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	501 # we need to store files rather than number of files as some files
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	502 # or subdirectories in a directory can be counted twice. This is
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	503 # also we have used sets here.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	504 try:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	505 absentdir[par].add(f)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	506 except KeyError:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	507 absentdir[par] = set([f])
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	508 absentfiles.append(par)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	509 return absentdir
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	510
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	511 indexes = {'m': 0, 'a': 1, 'r': 2, 'd': 3, 'u': 4, 'i': 5, 'c': 6}
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	512 # get a dictonary of directories and files which are missing as os.listdir()
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	513 # won't be able to list them.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	514 absentdir = absentones(statlist[2], statlist[3])
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	515 finalrs = [[]] * len(indexes)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	516 didsomethingchanged = False
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	517 # dictionary to store number of files and subdir in a directory so that we
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	518 # don't compute that again.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	519 lencache = {}
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	520
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	521 for st in pycompat.bytestr(status):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	522
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	523 try:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	524 ind = indexes[st]
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	525 except KeyError:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	526 # TODO: Need a better error message here
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	527 raise error.Abort("'%s' not recognized" % st)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	528
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	529 sfiles = statlist[ind]
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	530 if not sfiles:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	531 continue
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	532 pardict = {}
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	533 for a in sfiles:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	534 par = os.path.dirname(a)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	535 pardict.setdefault(par, []).append(a)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	536
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	537 rs = []
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	538 newls = []
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	539 for par, files in pardict.iteritems():
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	540 lenpar = numfiles(par)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	541 if lenpar == len(files):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	542 newls.append(par)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	543
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	544 if not newls:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	545 continue
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	546
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	547 while newls:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	548 newel = newls.pop()
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	549 if newel == '':
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	550 continue
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	551 parn = os.path.dirname(newel)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	552 pardict[newel] = []
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	553 # Adding pycompat.ossep as newel is a directory.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	554 pardict.setdefault(parn, []).append(newel + pycompat.ossep)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	555 lenpar = numfiles(parn)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	556 if lenpar == len(pardict[parn]):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	557 newls.append(parn)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	558
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	559 # dict.values() for Py3 compatibility
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	560 for files in pardict.values():
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	561 rs.extend(files)
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	562
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	563 rs.sort()
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	564 finalrs[ind] = rs
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	565 didsomethingchanged = True
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	566
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	567 # If nothing is changed, make sure the order of files is preserved.
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	568 if not didsomethingchanged:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	569 return statlist
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	570
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	571 for x in xrange(len(indexes)):
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	572 if not finalrs[x]:
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	573 finalrs[x] = statlist[x]
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	574
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	575 return finalrs
4cd4344a53c4 status: add a flag to terse the output (issue4119) Pulkit Goyal <7895pulkit@gmail.com> parents: 33509 diff changeset	576
33771 96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	577 def _commentlines(raw):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	578 '''Surround lineswith a comment char and a new line'''
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	579 lines = raw.splitlines()
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	580 commentedlines = ['# %s' % line for line in lines]
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	581 return '\n'.join(commentedlines) + '\n'
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	582
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	583 def _conflictsmsg(repo):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	584 # avoid merge cycle
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	585 from . import merge as mergemod
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	586 mergestate = mergemod.mergestate.read(repo)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	587 if not mergestate.active():
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	588 return
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	589
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	590 m = scmutil.match(repo[None])
34001 3340efe80803 morestatus: simplify check for unresolved merge conflicts Martin von Zweigbergk <martinvonz@google.com> parents: 33883 diff changeset	591 unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
33771 96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	592 if unresolvedlist:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	593 mergeliststr = '\n'.join(
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	594 [' %s' % os.path.relpath(
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	595 os.path.join(repo.root, path),
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	596 pycompat.getcwd()) for path in unresolvedlist])
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	597 msg = _('''Unresolved merge conflicts:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	598
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	599 %s
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	600
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	601 To mark files as resolved: hg resolve --mark FILE''') % mergeliststr
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	602 else:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	603 msg = _('No unresolved merge conflicts.')
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	604
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	605 return _commentlines(msg)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	606
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	607 def _helpmessage(continuecmd, abortcmd):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	608 msg = _('To continue: %s\n'
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	609 'To abort: %s') % (continuecmd, abortcmd)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	610 return _commentlines(msg)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	611
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	612 def _rebasemsg():
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	613 return _helpmessage('hg rebase --continue', 'hg rebase --abort')
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	614
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	615 def _histeditmsg():
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	616 return _helpmessage('hg histedit --continue', 'hg histedit --abort')
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	617
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	618 def _unshelvemsg():
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	619 return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	620
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	621 def _updatecleanmsg(dest=None):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	622 warning = _('warning: this will discard uncommitted changes')
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	623 return 'hg update --clean %s (%s)' % (dest or '.', warning)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	624
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	625 def _graftmsg():
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	626 # tweakdefaults requires `update` to have a rev hence the `.`
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	627 return _helpmessage('hg graft --continue', _updatecleanmsg())
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	628
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	629 def _mergemsg():
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	630 # tweakdefaults requires `update` to have a rev hence the `.`
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	631 return _helpmessage('hg commit', _updatecleanmsg())
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	632
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	633 def _bisectmsg():
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	634 msg = _('To mark the changeset good: hg bisect --good\n'
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	635 'To mark the changeset bad: hg bisect --bad\n'
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	636 'To abort: hg bisect --reset\n')
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	637 return _commentlines(msg)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	638
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	639 def fileexistspredicate(filename):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	640 return lambda repo: repo.vfs.exists(filename)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	641
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	642 def _mergepredicate(repo):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	643 return len(repo[None].parents()) > 1
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	644
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	645 STATES = (
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	646 # (state, predicate to detect states, helpful message function)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	647 ('histedit', fileexistspredicate('histedit-state'), _histeditmsg),
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	648 ('bisect', fileexistspredicate('bisect.state'), _bisectmsg),
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	649 ('graft', fileexistspredicate('graftstate'), _graftmsg),
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	650 ('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg),
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	651 ('rebase', fileexistspredicate('rebasestate'), _rebasemsg),
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	652 # The merge state is part of a list that will be iterated over.
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	653 # They need to be last because some of the other unfinished states may also
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	654 # be in a merge or update state (eg. rebase, histedit, graft, etc).
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	655 # We want those to have priority.
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	656 ('merge', _mergepredicate, _mergemsg),
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	657 )
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	658
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	659 def _getrepostate(repo):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	660 # experimental config: commands.status.skipstates
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	661 skip = set(repo.ui.configlist('commands', 'status.skipstates'))
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	662 for state, statedetectionpredicate, msgfn in STATES:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	663 if state in skip:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	664 continue
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	665 if statedetectionpredicate(repo):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	666 return (state, statedetectionpredicate, msgfn)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	667
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	668 def morestatus(repo, fm):
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	669 statetuple = _getrepostate(repo)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	670 label = 'status.morestatus'
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	671 if statetuple:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	672 fm.startitem()
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	673 state, statedetectionpredicate, helpfulmsg = statetuple
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	674 statemsg = _('The repository is in an unfinished %s state.') % state
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	675 fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	676 conmsg = _conflictsmsg(repo)
33883 e5d104c35e51 morestatus: check whether the conflict message is None before printing Pulkit Goyal <7895pulkit@gmail.com> parents: 33858 diff changeset	677 if conmsg:
e5d104c35e51 morestatus: check whether the conflict message is None before printing Pulkit Goyal <7895pulkit@gmail.com> parents: 33858 diff changeset	678 fm.write('conflictsmsg', '%s\n', conmsg, label=label)
33771 96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	679 if helpfulmsg:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	680 helpmsg = helpfulmsg()
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	681 fm.write('helpmsg', '%s\n', helpmsg, label=label)
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose` Pulkit Goyal <7895pulkit@gmail.com> parents: 33737 diff changeset	682
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	683 def findpossible(cmd, table, strict=False):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	684 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	685 Return cmd -> (aliases, command table entry)
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	686 for each matching command.
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	687 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	688 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	689 choice = {}
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	690 debugchoice = {}
15600 195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	691
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	692 if cmd in table:
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	693 # 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	694 keys = [cmd]
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	695 else:
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	696 keys = table.keys()
195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	697
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	698 allcmds = []
15600 195dbd1cef0c alias: shortcut command matching show shadowing works properly (issue3104) Matt Mackall <mpm@selenic.com> parents: 15231 diff changeset	699 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	700 aliases = parsealiases(e)
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	701 allcmds.extend(aliases)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	702 found = None
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	703 if cmd in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	704 found = cmd
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	705 elif not strict:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	706 for a in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	707 if a.startswith(cmd):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	708 found = a
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	709 break
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	710 if found is not None:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	711 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	712 debugchoice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	713 else:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	714 choice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	715
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	716 if not choice and debugchoice:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	717 choice = debugchoice
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	718
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	719 return choice, allcmds
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	720
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	721 def findcmd(cmd, table, strict=True):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	722 """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	723 choice, allcmds = findpossible(cmd, table, strict)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	724
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5843 diff changeset	725 if cmd in choice:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	726 return choice[cmd]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	727
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	728 if len(choice) > 1:
32528 9f56d462634c cmdutil: use sorted(dict) instead of x = dict.keys(); x.sort() Augie Fackler <raf@durin42.com> parents: 32434 diff changeset	729 clist = sorted(choice)
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7404 diff changeset	730 raise error.AmbiguousCommand(cmd, clist)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	731
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	732 if choice:
32862 e4a43b810528 py3: explicitly convert dict.values() to a list on py3 Pulkit Goyal <7895pulkit@gmail.com> parents: 32842 diff changeset	733 return list(choice.values())[0]
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	734
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24216 diff changeset	735 raise error.UnknownCommand(cmd, allcmds)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	736
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	737 def findrepo(p):
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	738 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	739 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	740 if p == oldp:
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	741 return None
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	742
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	743 return p
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	744
30755 0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	745 def bailifchanged(repo, merge=True, hint=None):
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	746 """ enforce the precondition that working directory must be clean.
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	747
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	748 'merge' can be set to false if a pending uncommitted merge should be
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	749 ignored (such as when 'update --check' runs).
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	750
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	751 'hint' is the usual hint given to Abort exception.
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	752 """
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	753
24472 1bf71faf042e cmdutil: allow bailifchanged to ignore merging in progress FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24471 diff changeset	754 if merge and repo.dirstate.p2() != nullid:
30755 0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	755 raise error.Abort(_('outstanding uncommitted merge'), hint=hint)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	756 modified, added, removed, deleted = repo.status()[:4]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	757 if modified or added or removed or deleted:
30755 0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	758 raise error.Abort(_('uncommitted changes'), hint=hint)
15231 cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 15214 diff changeset	759 ctx = repo[None]
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18340 diff changeset	760 for s in sorted(ctx.substate):
30755 0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30724 diff changeset	761 ctx.sub(s).bailifchanged(hint=hint)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	762
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14518 diff changeset	763 def logmessage(ui, opts):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	764 """ 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	765 message = opts.get('message')
bd5c37d792e6 cmdutil.logmessage: options should be optional Alexander Solovyov <piranha@piranha.org.ua> parents: 7643 diff changeset	766 logfile = opts.get('logfile')
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	767
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	768 if message and logfile:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	769 raise error.Abort(_('options --message and --logfile are mutually '
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	770 'exclusive'))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	771 if not message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	772 try:
32618 d3e1c5b4986c cmdutil: use isstdiofilename() where appropriate Yuya Nishihara <yuya@tcha.org> parents: 32584 diff changeset	773 if isstdiofilename(logfile):
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14518 diff changeset	774 message = ui.fin.read()
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	775 else:
14249 f4766e1bb0b3 cmdutil: normalize log message eols when reading from file Patrick Mezard <pmezard@gmail.com> parents: 14232 diff changeset	776 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	777 except IOError as inst:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	778 raise error.Abort(_("can't read commit message '%s': %s") %
34022 d5b2beca16c0 python3: wrap all uses of <exception>.strerror with strtolocal Augie Fackler <raf@durin42.com> parents: 34019 diff changeset	779 (logfile, encoding.strtolocal(inst.strerror)))
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	780 return message
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	781
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	782 def mergeeditform(ctxorbool, baseformname):
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	783 """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	784
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	785 '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	786 merging is committed.
75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	787
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	788 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	789 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	790 """
75618a223e18 commit: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22237 diff changeset	791 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	792 if ctxorbool:
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	793 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	794 elif 1 < len(ctxorbool.parents()):
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	795 return baseformname + ".merge"
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	796
d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	797 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	798
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	799 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	800 editform='', **opts):
21419 272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	801 """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	802
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	803 '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	804 (= '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	805 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	806 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	807 storing.
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	808
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	809 '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	810 '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	811 is automatically added.
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	812
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	813 '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	814 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	815
21419 272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	816 '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	817 '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	818 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	819 """
272785489ed3 cmdutil: enhance "getcommiteditor()" for specific usages in MQ FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21417 diff changeset	820 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	821 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	822 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	823 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	824 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	825 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	826 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	827 else:
dcf20f244c2a cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21241 diff changeset	828 return commiteditor
dcf20f244c2a cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21241 diff changeset	829
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	830 def loglimit(opts):
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	831 """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	832 limit = opts.get('limit')
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	833 if limit:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	834 try:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	835 limit = int(limit)
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	836 except ValueError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	837 raise error.Abort(_('limit must be a positive integer'))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	838 if limit <= 0:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	839 raise error.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	840 else:
10111 27457d31ae3f cmdutil: replace sys.maxint with None as default value in loglimit Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10061 diff changeset	841 limit = None
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	842 return limit
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	843
14986 70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	844 def makefilename(repo, pat, node, desc=None,
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	845 total=None, seqno=None, revwidth=None, pathname=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	846 node_expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	847 'H': lambda: hex(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	848 'R': lambda: str(repo.changelog.rev(node)),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	849 '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	850 'm': lambda: re.sub('[^\w]', '_', str(desc))
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	851 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	852 expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	853 '%': lambda: '%',
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	854 'b': lambda: os.path.basename(repo.root),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	855 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	856
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	857 try:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	858 if node:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	859 expander.update(node_expander)
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	860 if node:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	861 expander['r'] = (lambda:
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	862 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	863 if total is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	864 expander['N'] = lambda: str(total)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	865 if seqno is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	866 expander['n'] = lambda: str(seqno)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	867 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	868 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	869 if pathname is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	870 expander['s'] = lambda: os.path.basename(pathname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	871 expander['d'] = lambda: os.path.dirname(pathname) or '.'
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	872 expander['p'] = lambda: pathname
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	873
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	874 newname = []
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	875 patlen = len(pat)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	876 i = 0
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	877 while i < patlen:
32153 6f173560c7f4 py3: slice over bytes to prevent getting ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 32147 diff changeset	878 c = pat[i:i + 1]
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	879 if c == '%':
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	880 i += 1
32153 6f173560c7f4 py3: slice over bytes to prevent getting ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 32147 diff changeset	881 c = pat[i:i + 1]
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	882 c = expander[c]()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	883 newname.append(c)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	884 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	885 return ''.join(newname)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	886 except KeyError as inst:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	887 raise error.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	888 inst.args[0])
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	889
32539 447bbd970047 cmdutil: extract function checking if pattern should be taken as stdin/out Yuya Nishihara <yuya@tcha.org> parents: 32538 diff changeset	890 def isstdiofilename(pat):
447bbd970047 cmdutil: extract function checking if pattern should be taken as stdin/out Yuya Nishihara <yuya@tcha.org> parents: 32538 diff changeset	891 """True if the given pat looks like a filename denoting stdin/stdout"""
447bbd970047 cmdutil: extract function checking if pattern should be taken as stdin/out Yuya Nishihara <yuya@tcha.org> parents: 32538 diff changeset	892 return not pat or pat == '-'
447bbd970047 cmdutil: extract function checking if pattern should be taken as stdin/out Yuya Nishihara <yuya@tcha.org> parents: 32538 diff changeset	893
27418 2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	894 class _unclosablefile(object):
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	895 def __init__(self, fp):
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	896 self._fp = fp
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	897
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	898 def close(self):
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	899 pass
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	900
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	901 def __iter__(self):
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	902 return iter(self._fp)
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	903
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	904 def __getattr__(self, attr):
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	905 return getattr(self._fp, attr)
2ce4661ac226 cmdutil: reimplement file wrapper that disables close() Yuya Nishihara <yuya@tcha.org> parents: 27417 diff changeset	906
30142 3dcaf1c4e90d largefiles: use context for file closing Mads Kiilerich <madski@unity3d.com> parents: 30016 diff changeset	907 def __enter__(self):
3dcaf1c4e90d largefiles: use context for file closing Mads Kiilerich <madski@unity3d.com> parents: 30016 diff changeset	908 return self
3dcaf1c4e90d largefiles: use context for file closing Mads Kiilerich <madski@unity3d.com> parents: 30016 diff changeset	909
3dcaf1c4e90d largefiles: use context for file closing Mads Kiilerich <madski@unity3d.com> parents: 30016 diff changeset	910 def __exit__(self, exc_type, exc_value, exc_tb):
3dcaf1c4e90d largefiles: use context for file closing Mads Kiilerich <madski@unity3d.com> parents: 30016 diff changeset	911 pass
3dcaf1c4e90d largefiles: use context for file closing Mads Kiilerich <madski@unity3d.com> parents: 30016 diff changeset	912
14986 70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	913 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	914 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	915 pathname=None):
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	916
13769 8796fb6af67e cmdutil: fix mode handling in make_file Adrian Buehlmann <adrian@cadifra.com> parents: 13534 diff changeset	917 writable = mode not in ('r', 'rb')
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	918
32539 447bbd970047 cmdutil: extract function checking if pattern should be taken as stdin/out Yuya Nishihara <yuya@tcha.org> parents: 32538 diff changeset	919 if isstdiofilename(pat):
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	920 if writable:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	921 fp = repo.ui.fout
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	922 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	923 fp = repo.ui.fin
27419 7e2495bf0ad8 cmdutil: do not duplicate stdout by makefileobj() Yuya Nishihara <yuya@tcha.org> parents: 27418 diff changeset	924 return _unclosablefile(fp)
18613 1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	925 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	926 if modemap is not None:
b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	927 mode = modemap.get(fn, mode)
b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	928 if mode == 'wb':
b7f76db06dc0 cmdutil: fix makefileobj not to clobber default modemap dict Yuya Nishihara <yuya@tcha.org> parents: 19894 diff changeset	929 modemap[fn] = 'ab'
18613 1a2f4c633410 export: clobber files with -o (bc) (issue3652) Augie Fackler <raf@durin42.com> parents: 18538 diff changeset	930 return open(fn, mode)
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	931
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	932 def openrevlog(repo, cmd, file_, opts):
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	933 """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	934 cl = opts['changelog']
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	935 mf = opts['manifest']
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	936 dir = opts['dir']
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	937 msg = None
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	938 if cl and mf:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	939 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	940 elif cl and dir:
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	941 msg = _('cannot specify --changelog and --dir at the same time')
29427 33a6b750b5b9 debug: make debug{revlog,index,data} --dir not just a flag Martin von Zweigbergk <martinvonz@google.com> parents: 29397 diff changeset	942 elif cl or mf or dir:
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	943 if file_:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	944 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	945 elif not repo:
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	946 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	947 'without a repository')
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	948 if msg:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	949 raise error.Abort(msg)
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	950
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	951 r = None
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	952 if repo:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	953 if cl:
21033 254f55b64e31 debugrevlog: use unfiltered view for changelog Matt Mackall <mpm@selenic.com> parents: 21024 diff changeset	954 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	955 elif dir:
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	956 if 'treemanifest' not in repo.requirements:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	957 raise error.Abort(_("--dir can only be used on repos with "
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	958 "treemanifest enabled"))
30371 fccc3eea2ddb manifest: delete unused dirlog and _newmanifest functions Durham Goode <durham@fb.com> parents: 30340 diff changeset	959 dirlog = repo.manifestlog._revlog.dirlog(dir)
25119 49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	960 if len(dirlog):
49c583ca48c4 treemanifest: add --dir option to debug{revlog,data,index} Martin von Zweigbergk <martinvonz@google.com> parents: 25100 diff changeset	961 r = dirlog
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	962 elif mf:
30375 11b8b740d54a manifest: remove last uses of repo.manifest Durham Goode <durham@fb.com> parents: 30371 diff changeset	963 r = repo.manifestlog._revlog
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	964 elif file_:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	965 filelog = repo.file(file_)
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	966 if len(filelog):
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	967 r = filelog
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	968 if not r:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	969 if not file_:
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	970 raise error.CommandError(cmd, _('invalid arguments'))
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	971 if not os.path.isfile(file_):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	972 raise error.Abort(_("revlog '%s' not found") % file_)
31237 1b08aca7870a vfs: use 'vfs' module directly in 'mercurial.cmdutil' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31216 diff changeset	973 r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
14323 a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	974 file_[:-2] + ".i")
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	975 return r
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options Sune Foldager <cryo@cyanite.org> parents: 14322 diff changeset	976
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	977 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	978 # called with the repo lock held
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	979 #
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	980 # hgsep => pathname that uses "/" to separate directories
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	981 # 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	982 cwd = repo.getcwd()
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	983 targets = {}
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	984 after = opts.get("after")
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	985 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	986 wctx = repo[None]
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	987
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	988 def walkpat(pat):
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	989 srcs = []
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	990 if after:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	991 badstates = '?'
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	992 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	993 badstates = '?r'
32382 c87db79b9507 cleanup: reuse existing wctx variables instead of calling repo[None] Martin von Zweigbergk <martinvonz@google.com> parents: 32375 diff changeset	994 m = scmutil.match(wctx, [pat], opts, globbed=True)
c87db79b9507 cleanup: reuse existing wctx variables instead of calling repo[None] Martin von Zweigbergk <martinvonz@google.com> parents: 32375 diff changeset	995 for abs in wctx.walk(m):
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	996 state = repo.dirstate[abs]
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	997 rel = m.rel(abs)
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	998 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	999 if state in badstates:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1000 if exact and state == '?':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1001 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	1002 if exact and state == 'r':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1003 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	1004 ' remove\n') % rel)
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1005 continue
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1006 # abs: hgsep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1007 # rel: ossep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1008 srcs.append((abs, rel, exact))
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1009 return srcs
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1010
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1011 # abssrc: hgsep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1012 # relsrc: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1013 # otarget: ossep
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1014 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	1015 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	1016 if '/' in abstarget:
e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	1017 # 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	1018 # case only renames, like a => A.
e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	1019 abspath, absname = abstarget.rsplit('/', 1)
e596a631210e dirstate: preserve path components case on renames (issue3402) Patrick Mezard <patrick@mezard.eu> parents: 16458 diff changeset	1020 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1021 reltarget = repo.pathto(abstarget, cwd)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1022 target = repo.wjoin(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1023 src = repo.wjoin(abssrc)
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1024 state = repo.dirstate[abstarget]
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1025
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: 13945 diff changeset	1026 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	1027
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1028 # check for collisions
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1029 prevsrc = targets.get(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1030 if prevsrc is not None:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1031 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	1032 (reltarget, repo.pathto(abssrc, cwd),
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1033 repo.pathto(prevsrc, cwd)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1034 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1035
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1036 # check for overwrites
12342 70236d6fd844 rename: do not overwrite existing broken symlinks Patrick Mezard <pmezard@gmail.com> parents: 11950 diff changeset	1037 exists = os.path.lexists(target)
16283 6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1038 samefile = False
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1039 if exists and abssrc != abstarget:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1040 if (repo.dirstate.normalize(abssrc) ==
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1041 repo.dirstate.normalize(abstarget)):
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1042 if not rename:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1043 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	1044 return
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1045 exists = False
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1046 samefile = True
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1047
8117 2b30d8488819 remove unnecessary outer parenthesis in if-statements Martin Geisler <mg@lazybytes.net> parents: 8013 diff changeset	1048 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	1049 if not opts['force']:
30151 381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1050 if state in 'mn':
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1051 msg = _('%s: not overwriting - file already committed\n')
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1052 if after:
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1053 flags = '--after --force'
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1054 else:
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1055 flags = '--force'
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1056 if rename:
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1057 hint = _('(hg rename %s to replace the file by '
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1058 'recording a rename)\n') % flags
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1059 else:
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1060 hint = _('(hg copy %s to replace the file by '
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1061 'recording a copy)\n') % flags
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1062 else:
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1063 msg = _('%s: not overwriting - file exists\n')
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1064 if rename:
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1065 hint = _('(hg rename --after to record the rename)\n')
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1066 else:
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1067 hint = _('(hg copy --after to record the copy)\n')
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1068 ui.warn(msg % reltarget)
381293e1135e copy: distinguish "file exists" cases and add a hint (BC) Augie Fackler <augie@google.com> parents: 30142 diff changeset	1069 ui.warn(hint)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1070 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1071
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1072 if after:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1073 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	1074 if rename:
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	1075 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	1076 (relsrc, reltarget))
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	1077 else:
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	1078 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	1079 (relsrc, reltarget))
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1080 return
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1081 elif not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1082 try:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1083 if exists:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1084 os.unlink(target)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1085 targetdir = os.path.dirname(target) or '.'
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1086 if not os.path.isdir(targetdir):
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1087 os.makedirs(targetdir)
16283 6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1088 if samefile:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1089 tmp = target + "~hgrename"
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1090 os.rename(src, tmp)
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1091 os.rename(tmp, target)
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1092 else:
6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1093 util.copyfile(src, target)
14518 a67e866f46f9 workingctx: eliminate remove function Adrian Buehlmann <adrian@cadifra.com> parents: 14442 diff changeset	1094 srcexists = True
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	1095 except IOError as inst:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1096 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	1097 ui.warn(_('%s: deleted in working directory\n') % relsrc)
14518 a67e866f46f9 workingctx: eliminate remove function Adrian Buehlmann <adrian@cadifra.com> parents: 14442 diff changeset	1098 srcexists = False
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1099 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1100 ui.warn(_('%s: cannot copy - %s\n') %
34022 d5b2beca16c0 python3: wrap all uses of <exception>.strerror with strtolocal Augie Fackler <raf@durin42.com> parents: 34019 diff changeset	1101 (relsrc, encoding.strtolocal(inst.strerror)))
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	1102 return True # report a failure
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1103
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1104 if ui.verbose or not exact:
7894 caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	1105 if rename:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	1106 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	1107 else:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	1108 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	1109
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1110 targets[abstarget] = abssrc
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1111
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1112 # fix up dirstate
14321 003d63bb4fa5 scmutil: drop some aliases in cmdutil Matt Mackall <mpm@selenic.com> parents: 14320 diff changeset	1113 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
003d63bb4fa5 scmutil: drop some aliases in cmdutil Matt Mackall <mpm@selenic.com> parents: 14320 diff changeset	1114 dryrun=dryrun, cwd=cwd)
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	1115 if rename and not dryrun:
16283 6c4dbe28dda3 rename: handle case-changing (issue1717) Matt Mackall <mpm@selenic.com> parents: 16165 diff changeset	1116 if not after and srcexists and not samefile:
31309 8908f985570c vfs: use repo.wvfs.unlinkpath Mads Kiilerich <madski@unity3d.com> parents: 31237 diff changeset	1117 repo.wvfs.unlinkpath(abssrc)
14518 a67e866f46f9 workingctx: eliminate remove function Adrian Buehlmann <adrian@cadifra.com> parents: 14442 diff changeset	1118 wctx.forget([abssrc])
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1119
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1120 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1121 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1122 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1123 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1124 def targetpathfn(pat, dest, srcs):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1125 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	1126 abspfx = pathutil.canonpath(repo.root, cwd, pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1127 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1128 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1129 striplen = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1130 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1131 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1132 if striplen:
30615 bb77654dc7ae py3: replace os.sep with pycompat.ossep (part 3 of 4) Pulkit Goyal <7895pulkit@gmail.com> parents: 30534 diff changeset	1133 striplen += len(pycompat.ossep)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1134 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	1135 elif destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1136 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1137 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1138 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1139 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1140 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1141
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1142 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1143 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1144 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1145 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1146 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	1147 if matchmod.patkind(pat):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1148 # a mercurial pattern
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1149 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1150 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1151 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	1152 abspfx = pathutil.canonpath(repo.root, cwd, pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1153 if len(abspfx) < len(srcs[0][0]):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1154 # 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	1155 # 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	1156 def evalpath(striplen):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1157 score = 0
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1158 for s in srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1159 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	1160 if os.path.lexists(t):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1161 score += 1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1162 return score
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1163
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1164 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1165 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1166 if striplen:
30615 bb77654dc7ae py3: replace os.sep with pycompat.ossep (part 3 of 4) Pulkit Goyal <7895pulkit@gmail.com> parents: 30534 diff changeset	1167 striplen += len(pycompat.ossep)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1168 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	1169 score = evalpath(striplen)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1170 striplen1 = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1171 if striplen1:
30615 bb77654dc7ae py3: replace os.sep with pycompat.ossep (part 3 of 4) Pulkit Goyal <7895pulkit@gmail.com> parents: 30534 diff changeset	1172 striplen1 += len(pycompat.ossep)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1173 if evalpath(striplen1) > score:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1174 striplen = striplen1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1175 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1176 util.localpath(p)[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1177 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1178 # a file
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1179 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1180 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1181 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1182 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1183 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1184 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1185
14321 003d63bb4fa5 scmutil: drop some aliases in cmdutil Matt Mackall <mpm@selenic.com> parents: 14320 diff changeset	1186 pats = scmutil.expandpats(pats)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1187 if not pats:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1188 raise error.Abort(_('no source or destination specified'))
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1189 if len(pats) == 1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1190 raise error.Abort(_('no destination specified'))
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1191 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	1192 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	1193 if not destdirexists:
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	1194 if len(pats) > 1 or matchmod.patkind(pats[0]):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1195 raise error.Abort(_('with multiple sources, destination must be an '
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1196 '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	1197 if util.endswithsep(dest):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1198 raise error.Abort(_('destination %s is not a directory') % dest)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1199
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1200 tfn = targetpathfn
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	1201 if after:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1202 tfn = targetpathafterfn
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1203 copylist = []
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1204 for pat in pats:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1205 srcs = walkpat(pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1206 if not srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1207 continue
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1208 copylist.append((tfn(pat, dest, srcs), srcs))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1209 if not copylist:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1210 raise error.Abort(_('no files to copy'))
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1211
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	1212 errors = 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1213 for targetpath, srcs in copylist:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	1214 for abssrc, relsrc, exact in srcs:
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	1215 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	1216 errors += 1
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1217
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1218 if errors:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1219 ui.warn(_('(consider using --after)\n'))
5609 a783d3627144 copy: move rename logic Matt Mackall <mpm@selenic.com> parents: 5608 diff changeset	1220
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11152 diff changeset	1221 return errors != 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	1222
26561 1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1223 ## facility to let extension process additional data into an import patch
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1224 # list of identifier to be executed in order
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1225 extrapreimport = [] # run before commit
26562 dd2f5e014806 import: allow processing of extra part header after import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26561 diff changeset	1226 extrapostimport = [] # run after commit
26561 1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1227 # mapping from identifier to actual import function
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1228 #
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1229 # 'preimport' are run before the commit is made and are provided the following
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1230 # arguments:
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1231 # - repo: the localrepository instance,
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1232 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26750 diff changeset	1233 # - extra: the future extra dictionary of the changeset, please mutate it,
26561 1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1234 # - opts: the import options.
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1235 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1236 # mutation of in memory commit and more. Feel free to rework the code to get
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1237 # there.
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1238 extrapreimportmap = {}
26562 dd2f5e014806 import: allow processing of extra part header after import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26561 diff changeset	1239 # 'postimport' are run after the commit is made and are provided the following
dd2f5e014806 import: allow processing of extra part header after import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26561 diff changeset	1240 # argument:
dd2f5e014806 import: allow processing of extra part header after import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26561 diff changeset	1241 # - ctx: the changectx created by import.
dd2f5e014806 import: allow processing of extra part header after import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26561 diff changeset	1242 extrapostimportmap = {}
26561 1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1243
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1244 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	1245 """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	1246
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1247 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	1248 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	1249
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1250 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	1251 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	1252
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1253 :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	1254 :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	1255 :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	1256 :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	1257 (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	1258 :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	1259 updatefunc(<repo>, <node>)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1260 """
25930 221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	1261 # avoid cycle context -> subrepo -> cmdutil
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	1262 from . import context
26547 b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	1263 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	1264 tmpname = extractdata.get('filename')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	1265 message = extractdata.get('message')
27612 a0dfe8d286fe import: refactor date and user handling timeless <timeless@mozdev.org> parents: 27611 diff changeset	1266 user = opts.get('user') or extractdata.get('user')
a0dfe8d286fe import: refactor date and user handling timeless <timeless@mozdev.org> parents: 27611 diff changeset	1267 date = opts.get('date') or extractdata.get('date')
26547 b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	1268 branch = extractdata.get('branch')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	1269 nodeid = extractdata.get('nodeid')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	1270 p1 = extractdata.get('p1')
b9be8ab6e628 patch: move 'extract' return to a dictionnary Pierre-Yves David <pierre-yves.david@fb.com> parents: 26545 diff changeset	1271 p2 = extractdata.get('p2')
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1272
27613 dffd2ed9a7c4 import: refactor nocommit and importbranch handling timeless <timeless@mozdev.org> parents: 27612 diff changeset	1273 nocommit = opts.get('no_commit')
dffd2ed9a7c4 import: refactor nocommit and importbranch handling timeless <timeless@mozdev.org> parents: 27612 diff changeset	1274 importbranch = opts.get('import_branch')
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1275 update = not opts.get('bypass')
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1276 strip = opts["strip"]
24259 5ac8ce04baa2 cmdutil.tryimportone: allow importing relative patches into the working dir Siddharth Agarwal <sid0@fb.com> parents: 24222 diff changeset	1277 prefix = opts["prefix"]
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1278 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	1279 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	1280 return (None, None, False)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1281
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	1282 rejects = False
bee0e1cffdd3 import: add --partial flag to create a changeset despite failed hunks Pierre-Yves David <pierre-yves.david@fb.com> parents: 21419 diff changeset	1283
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1284 try:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1285 cmdline_message = logmessage(ui, opts)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1286 if cmdline_message:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1287 # pickup the cmdline msg
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1288 message = cmdline_message
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1289 elif message:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1290 # pickup the patch msg
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1291 message = message.strip()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1292 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1293 # launch the editor
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1294 message = None
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1295 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	1296
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1297 if len(parents) == 1:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1298 parents.append(repo[nullid])
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1299 if opts.get('exact'):
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1300 if not nodeid or not p1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1301 raise error.Abort(_('not a Mercurial patch'))
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1302 p1 = repo[p1]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1303 p2 = repo[p2 or nullid]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1304 elif p2:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1305 try:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1306 p1 = repo[p1]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1307 p2 = repo[p2]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1308 # 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	1309 # 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	1310 # first parent.
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1311 if p1 != parents[0]:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1312 p1 = parents[0]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1313 p2 = repo[nullid]
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1314 except error.RepoError:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1315 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	1316 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	1317 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	1318 "(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	1319 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1320 p1, p2 = parents
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1321
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1322 n = None
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1323 if update:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1324 if p1 != parents[0]:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1325 updatefunc(repo, p1.node())
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1326 if p2 != parents[1]:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1327 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	1328
27613 dffd2ed9a7c4 import: refactor nocommit and importbranch handling timeless <timeless@mozdev.org> parents: 27612 diff changeset	1329 if opts.get('exact') or importbranch:
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1330 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	1331
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	1332 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	1333 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	1334 try:
24259 5ac8ce04baa2 cmdutil.tryimportone: allow importing relative patches into the working dir Siddharth Agarwal <sid0@fb.com> parents: 24222 diff changeset	1335 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	1336 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	1337 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	1338 if not partial:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1339 raise error.Abort(str(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	1340 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	1341 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	1342
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1343 files = list(files)
27613 dffd2ed9a7c4 import: refactor nocommit and importbranch handling timeless <timeless@mozdev.org> parents: 27612 diff changeset	1344 if nocommit:
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1345 if message:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1346 msgs.append(message)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1347 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1348 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	1349 # 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	1350 # 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	1351 # 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	1352 m = None
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1353 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1354 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	1355 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	1356 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	1357 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	1358 else:
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	1359 editor = getcommiteditor(editform=editform, **opts)
26561 1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1360 extra = {}
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1361 for idfunc in extrapreimport:
1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1362 extrapreimportmap[idfunc](repo, extractdata, extra, opts)
31457 707f9fd2dcad import: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31451 diff changeset	1363 overrides = {}
707f9fd2dcad import: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31451 diff changeset	1364 if partial:
707f9fd2dcad import: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31451 diff changeset	1365 overrides[('ui', 'allowemptycommit')] = True
707f9fd2dcad import: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31451 diff changeset	1366 with repo.ui.configoverride(overrides, 'import'):
27612 a0dfe8d286fe import: refactor date and user handling timeless <timeless@mozdev.org> parents: 27611 diff changeset	1367 n = repo.commit(message, user,
a0dfe8d286fe import: refactor date and user handling timeless <timeless@mozdev.org> parents: 27611 diff changeset	1368 date, match=m,
26561 1f14920a892c import: allow processing of extra part header during import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26547 diff changeset	1369 editor=editor, extra=extra)
26562 dd2f5e014806 import: allow processing of extra part header after import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26561 diff changeset	1370 for idfunc in extrapostimport:
dd2f5e014806 import: allow processing of extra part header after import Pierre-Yves David <pierre-yves.david@fb.com> parents: 26561 diff changeset	1371 extrapostimportmap[idfunc](repo[n])
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1372 else:
27613 dffd2ed9a7c4 import: refactor nocommit and importbranch handling timeless <timeless@mozdev.org> parents: 27612 diff changeset	1373 if opts.get('exact') or importbranch:
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1374 branch = branch or 'default'
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1375 else:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1376 branch = p1.branch()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1377 store = patch.filestore()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1378 try:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1379 files = set()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1380 try:
24260 76225ab5a5da cmdutil.tryimportone: allow importing relative patches with --bypass Siddharth Agarwal <sid0@fb.com> parents: 24259 diff changeset	1381 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	1382 files, eolmode=None)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	1383 except patch.PatchError as e:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1384 raise error.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	1385 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	1386 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	1387 else:
ffaaa80fa724 import: avoid editor invocation when importing with "--exact" for exact-ness FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22260 diff changeset	1388 editor = getcommiteditor(editform='import.bypass')
32765 041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32662 diff changeset	1389 memctx = context.memctx(repo, (p1.node(), p2.node()),
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1390 message,
32765 041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32662 diff changeset	1391 files=files,
041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32662 diff changeset	1392 filectxfn=store,
041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32662 diff changeset	1393 user=user,
041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32662 diff changeset	1394 date=date,
041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32662 diff changeset	1395 branch=branch,
22011 97acb4504704 import: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22010 diff changeset	1396 editor=editor)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1397 n = memctx.commit()
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1398 finally:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1399 store.close()
27613 dffd2ed9a7c4 import: refactor nocommit and importbranch handling timeless <timeless@mozdev.org> parents: 27612 diff changeset	1400 if opts.get('exact') and nocommit:
22485 efedda4aed49 import: let --exact 'work' with --no-commit (issue4376) Matt Mackall <mpm@selenic.com> parents: 22427 diff changeset	1401 # --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	1402 # and branch bits
efedda4aed49 import: let --exact 'work' with --no-commit (issue4376) Matt Mackall <mpm@selenic.com> parents: 22427 diff changeset	1403 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	1404 elif opts.get('exact') and hex(n) != nodeid:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	1405 raise error.Abort(_('patch is damaged or loses information'))
27611 fa8c491f2deb import: limit scope of msg in tryimportone timeless <timeless@mozdev.org> parents: 27533 diff changeset	1406 msg = _('applied to working directory')
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1407 if n:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1408 # 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	1409 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	1410 return (msg, n, rejects)
20500 ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1411 finally:
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1412 os.unlink(tmpname)
ce3f3082ec45 import: move tryone closure in cmdutil Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20470 diff changeset	1413
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	1414 # 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	1415 # 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	1416 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	1417 # 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	1418 # 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	1419 # 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	1420 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	1421
32433 7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1422 def _exportsingle(repo, ctx, match, switch_parent, rev, seqno, write, diffopts):
32662 9d201b39ccd9 export: map wctx.node() to 'ff...' node id (issue5438) Yuya Nishihara <yuya@tcha.org> parents: 32658 diff changeset	1423 node = scmutil.binnode(ctx)
32433 7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1424 parents = [p.node() for p in ctx.parents() if p]
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1425 branch = ctx.branch()
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1426 if switch_parent:
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1427 parents.reverse()
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1428
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1429 if parents:
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1430 prev = parents[0]
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1431 else:
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1432 prev = nullid
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1433
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1434 write("# HG changeset patch\n")
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1435 write("# User %s\n" % ctx.user())
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1436 write("# Date %d %d\n" % ctx.date())
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1437 write("# %s\n" % util.datestr(ctx.date()))
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1438 if branch and branch != 'default':
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1439 write("# Branch %s\n" % branch)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1440 write("# Node ID %s\n" % hex(node))
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1441 write("# Parent %s\n" % hex(prev))
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1442 if len(parents) > 1:
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1443 write("# Parent %s\n" % hex(parents[1]))
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1444
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1445 for headerid in extraexport:
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1446 header = extraexportmap[headerid](seqno, ctx)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1447 if header is not None:
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1448 write('# %s\n' % header)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1449 write(ctx.description().rstrip())
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1450 write("\n\n")
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1451
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1452 for chunk, label in patch.diffui(repo, prev, node, match, opts=diffopts):
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1453 write(chunk, label=label)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1454
32431 9fd9f91b0c43 cmdutil: rename template param to export to fntemplate Augie Fackler <augie@google.com> parents: 32430 diff changeset	1455 def export(repo, revs, fntemplate='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	1456 opts=None, match=None):
32430 1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1457 '''export changesets as hg patches
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1458
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1459 Args:
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1460 repo: The repository from which we're exporting revisions.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1461 revs: A list of revisions to export as revision numbers.
32431 9fd9f91b0c43 cmdutil: rename template param to export to fntemplate Augie Fackler <augie@google.com> parents: 32430 diff changeset	1462 fntemplate: An optional string to use for generating patch file names.
32430 1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1463 fp: An optional file-like object to which patches should be written.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1464 switch_parent: If True, show diffs against second parent when not nullid.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1465 Default is false, which always shows diff against p1.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1466 opts: diff options to use for generating the patch.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1467 match: If specified, only export changes to files matching this matcher.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1468
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1469 Returns:
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1470 Nothing.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1471
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1472 Side Effect:
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1473 "HG Changeset Patch" data is emitted to one of the following
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1474 destinations:
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1475 fp is specified: All revs are written to the specified
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1476 file-like object.
32431 9fd9f91b0c43 cmdutil: rename template param to export to fntemplate Augie Fackler <augie@google.com> parents: 32430 diff changeset	1477 fntemplate specified: Each rev is written to a unique file named using
32430 1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1478 the given template.
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1479 Neither fp nor template specified: All revs written to repo.ui.write()
1f4be037f558 cmdutil: comprehensively document the interface of export Augie Fackler <augie@google.com> parents: 32382 diff changeset	1480 '''
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1481
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1482 total = len(revs)
32432 75544176bc28 cmdutil: use a generator expression instead of a list comprehension Augie Fackler <augie@google.com> parents: 32431 diff changeset	1483 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	1484 filemode = {}
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1485
32434 69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1486 write = None
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1487 dest = '<unnamed>'
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1488 if fp:
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1489 dest = getattr(fp, 'name', dest)
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1490 def write(s, **kw):
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1491 fp.write(s)
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1492 elif not fntemplate:
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1493 write = repo.ui.write
69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1494
32433 7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1495 for seqno, rev in enumerate(revs, 1):
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1496 ctx = repo[rev]
32433 7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1497 fo = None
32434 69c864149d69 cmdutil: avoid redefining write() function in export if possible Augie Fackler <augie@google.com> parents: 32433 diff changeset	1498 if not fp and fntemplate:
14986 70e11de6964d export: add %m to file format string (first line of the commit message) Andrzej Bieniek <andyhelp@gmail.com> parents: 14948 diff changeset	1499 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	1500 desc = desc_lines[0] #Commit always has a first line.
32433 7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1501 fo = makefileobj(repo, fntemplate, ctx.node(), desc=desc,
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1502 total=total, seqno=seqno, revwidth=revwidth,
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1503 mode='wb', modemap=filemode)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1504 dest = fo.name
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1505 def write(s, **kw):
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1506 fo.write(s)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1507 if not dest.startswith('<'):
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1508 repo.ui.note("%s\n" % dest)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1509 _exportsingle(
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1510 repo, ctx, match, switch_parent, rev, seqno, write, opts)
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1511 if fo is not None:
7feaf5550a9e cmdutil: extract closure that performs the actual export formatting Augie Fackler <augie@google.com> parents: 32432 diff changeset	1512 fo.close()
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	1513
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1514 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	1515 changes=None, stat=False, fp=None, prefix='',
24455 16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	1516 root='', listsubrepos=False):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1517 '''show diff or diffstat.'''
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1518 if fp is None:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1519 write = ui.write
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1520 else:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1521 def write(s, **kw):
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1522 fp.write(s)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1523
24455 16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	1524 if root:
16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	1525 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	1526 else:
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1527 relroot = ''
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1528 if relroot != '':
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1529 # 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	1530 # subrepo
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1531 uirelroot = match.uipath(relroot)
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1532 relroot += '/'
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1533 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	1534 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	1535 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	1536 match.uipath(matchroot), uirelroot))
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1537
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1538 if stat:
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1539 diffopts = diffopts.copy(context=0)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1540 width = 80
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1541 if not ui.plain():
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12619 diff changeset	1542 width = ui.termwidth()
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1543 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	1544 prefix=prefix, relroot=relroot)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1545 for chunk, label in patch.diffstatui(util.iterlines(chunks),
30407 e1677cc29da6 patch: remove unused git parameter from patch.diffstat() Henning Schild <henning@hennsch.de> parents: 30375 diff changeset	1546 width=width):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1547 write(chunk, label=label)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1548 else:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1549 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	1550 changes, diffopts, prefix=prefix,
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	1551 relroot=relroot):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1552 write(chunk, label=label)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	1553
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1554 if listsubrepos:
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1555 ctx1 = repo[node1]
12175 c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	1556 ctx2 = repo[node2]
20392 d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	1557 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	1558 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	1559 try:
cfc15cbecc5e diff: don't crash when diffing a revision with a deleted subrepo (issue3153) Renato Cunha <renato@renatocunha.com> parents: 15600 diff changeset	1560 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	1561 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	1562 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	1563 # 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	1564 # 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	1565 # 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	1566 tempnode2 = None
28017 d3f1b7ee5e70 match: rename "narrowmatcher" to "subdirmatcher" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 27985 diff changeset	1567 submatch = matchmod.subdirmatcher(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	1568 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	1569 stat=stat, fp=fp, prefix=prefix)
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	1570
30694 5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30615 diff changeset	1571 def _changesetlabels(ctx):
5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30615 diff changeset	1572 labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
31698 9b3577796291 cmdutil: add a "changeset.obsolete" label in changeset_printer Denis Laxalde <denis@laxalde.org> parents: 31486 diff changeset	1573 if ctx.obsolete():
9b3577796291 cmdutil: add a "changeset.obsolete" label in changeset_printer Denis Laxalde <denis@laxalde.org> parents: 31486 diff changeset	1574 labels.append('changeset.obsolete')
33730 52c5ff856b49 context: rename troubled into isunstable Boris Feld <boris.feld@octobus.net> parents: 33726 diff changeset	1575 if ctx.isunstable():
33781 3821dfee2cfc label: rename changeset.troubled into changeset.unstable Boris Feld <boris.feld@octobus.net> parents: 33771 diff changeset	1576 labels.append('changeset.unstable')
33726 ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33694 diff changeset	1577 for instability in ctx.instabilities():
33782 40739aef97f7 label: rename trouble.X into instability.X Boris Feld <boris.feld@octobus.net> parents: 33781 diff changeset	1578 labels.append('instability.%s' % instability)
30694 5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30615 diff changeset	1579 return ' '.join(labels)
5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30615 diff changeset	1580
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1581 class changeset_printer(object):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1582 '''show changeset information when templating not requested.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1583
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1584 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	1585 self.ui = ui
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1586 self.repo = repo
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1587 self.buffered = buffered
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1588 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	1589 self.diffopts = diffopts
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1590 self.header = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1591 self.hunk = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1592 self.lastheader = None
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1593 self.footer = None
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1594
25763 60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	1595 def flush(self, ctx):
60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	1596 rev = ctx.rev()
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1597 if rev in self.header:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1598 h = self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1599 if h != self.lastheader:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1600 self.lastheader = h
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1601 self.ui.write(h)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1602 del self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1603 if rev in self.hunk:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1604 self.ui.write(self.hunk[rev])
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1605 del self.hunk[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1606 return 1
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1607 return 0
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1608
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1609 def close(self):
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1610 if self.footer:
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1611 self.ui.write(self.footer)
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1612
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1613 def show(self, ctx, copies=None, matchfn=None, **props):
33100 05906b8e1d23 py3: use pycompat.byteskwargs() to convert kwargs' keys to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 33045 diff changeset	1614 props = pycompat.byteskwargs(props)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1615 if self.buffered:
27107 c57ebef70f6f cmdutil: pass labeled=True to pushbuffer() Gregory Szorc <gregory.szorc@gmail.com> parents: 27065 diff changeset	1616 self.ui.pushbuffer(labeled=True)
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1617 self._show(ctx, copies, matchfn, props)
27109 a93d53f79e6e ui: remove labeled argument from popbuffer Gregory Szorc <gregory.szorc@gmail.com> parents: 27107 diff changeset	1618 self.hunk[ctx.rev()] = self.ui.popbuffer()
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1619 else:
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1620 self._show(ctx, copies, matchfn, props)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	1621
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1622 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	1623 '''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	1624 changenode = ctx.node()
87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	1625 rev = ctx.rev()
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1626 if self.ui.debugflag:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1627 hexfunc = hex
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1628 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	1629 hexfunc = short
25762 f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25759 diff changeset	1630 # 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	1631 # show the same values as {node} and {rev} templatekw
32658 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	1632 revnode = (scmutil.intrev(ctx), hexfunc(scmutil.binnode(ctx)))
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1633
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1634 if self.ui.quiet:
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1635 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	1636 return
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1637
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	1638 date = util.datestr(ctx.date())
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1639
17891 8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1640 # 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	1641 self.ui.write(_("changeset: %d:%s\n") % revnode,
30694 5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30615 diff changeset	1642 label=_changesetlabels(ctx))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1643
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1644 # 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	1645 # compatibility
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	1646 branch = ctx.branch()
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	1647 # 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	1648 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	1649 # 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	1650 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	1651 label='log.branch')
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1652
28904 80be5dbe6e74 cmdutil: avoid recycling variable name "name" in namespaces code Nathaniel Manista <nathaniel@google.com> parents: 28891 diff changeset	1653 for nsname, ns in self.repo.names.iteritems():
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1654 # 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	1655 # skip it
28904 80be5dbe6e74 cmdutil: avoid recycling variable name "name" in namespaces code Nathaniel Manista <nathaniel@google.com> parents: 28891 diff changeset	1656 if nsname == 'branches':
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1657 continue
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1658 # 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	1659 # should be the same
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	1660 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	1661 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	1662 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	1663 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	1664 # 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	1665 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	1666 label='log.phase')
26433 3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26426 diff changeset	1667 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	1668 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	1669 # 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	1670 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	1671 % (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	1672 label=label)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1673
24585 e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	1674 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	1675 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	1676 # i18n: column positioning for "hg log"
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1677 self.ui.write(_("manifest: %d:%s\n") %
30375 11b8b740d54a manifest: remove last uses of repo.manifest Durham Goode <durham@fb.com> parents: 30371 diff changeset	1678 (self.repo.manifestlog._revlog.rev(mnode),
11b8b740d54a manifest: remove last uses of repo.manifest Durham Goode <durham@fb.com> parents: 30371 diff changeset	1679 hex(mnode)),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1680 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	1681 # 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	1682 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	1683 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	1684 # 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	1685 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	1686 label='log.date')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1687
33730 52c5ff856b49 context: rename troubled into isunstable Boris Feld <boris.feld@octobus.net> parents: 33726 diff changeset	1688 if ctx.isunstable():
30710 7e95e70bad57 cmdutil: add missing "i18n" comment about "trouble: " line Denis Laxalde <denis.laxalde@logilab.fr> parents: 30703 diff changeset	1689 # i18n: column positioning for "hg log"
33726 ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33694 diff changeset	1690 instabilities = ctx.instabilities()
ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33694 diff changeset	1691 self.ui.write(_("instability: %s\n") % ', '.join(instabilities),
33783 db6b666ce1e6 label: rename log.trouble into log.instability Boris Feld <boris.feld@octobus.net> parents: 33782 diff changeset	1692 label='log.instability')
30695 f05ede08dcf7 cmdutil: add support for evolution "troubles" display in changeset_printer Denis Laxalde <denis.laxalde@logilab.fr> parents: 30694 diff changeset	1693
33154 4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33102 diff changeset	1694 self._exthook(ctx)
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33102 diff changeset	1695
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1696 if self.ui.debugflag:
24485 914caae9a86a changeset_printer: use changectx to get status tuple Yuya Nishihara <yuya@tcha.org> parents: 24484 diff changeset	1697 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	1698 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	1699 _("files:"),
8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1700 # 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	1701 _("files+:"),
8f85151ce201 i18n: add "i18n" comment to column positioning messages of "hg log" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17863 diff changeset	1702 # 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	1703 _("files-:")], files):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1704 if value:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1705 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	1706 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	1707 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	1708 # 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	1709 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	1710 label='ui.note log.files')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1711 if copies and self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1712 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	1713 # 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	1714 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	1715 label='ui.note log.copies')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1716
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	1717 extra = ctx.extra()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1718 if extra and self.ui.debugflag:
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1719 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	1720 # i18n: column positioning for "hg log"
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1721 self.ui.write(_("extra: %s=%s\n")
31451 53865692a354 util: wrap s.encode('string_escape') call for future py3 compatibility Yuya Nishihara <yuya@tcha.org> parents: 31320 diff changeset	1722 % (key, util.escapestr(value)),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1723 label='ui.debug log.extra')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1724
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	1725 description = ctx.description().strip()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1726 if description:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1727 if self.ui.verbose:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1728 self.ui.write(_("description:\n"),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1729 label='ui.note log.description')
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1730 self.ui.write(description,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1731 label='ui.note log.description')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1732 self.ui.write("\n\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1733 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	1734 # i18n: column positioning for "hg log"
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1735 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	1736 description.splitlines()[0],
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	1737 label='log.summary')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1738 self.ui.write("\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1739
27065 93bcc73df8d5 cmdutil.changeset_printer: pass context into showpatch() Gregory Szorc <gregory.szorc@gmail.com> parents: 26938 diff changeset	1740 self.showpatch(ctx, matchfn)
93bcc73df8d5 cmdutil.changeset_printer: pass context into showpatch() Gregory Szorc <gregory.szorc@gmail.com> parents: 26938 diff changeset	1741
33154 4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33102 diff changeset	1742 def _exthook(self, ctx):
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33102 diff changeset	1743 '''empty method used by extension as a hook point
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33102 diff changeset	1744 '''
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33102 diff changeset	1745 pass
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33102 diff changeset	1746
27065 93bcc73df8d5 cmdutil.changeset_printer: pass context into showpatch() Gregory Szorc <gregory.szorc@gmail.com> parents: 26938 diff changeset	1747 def showpatch(self, ctx, matchfn):
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1748 if not matchfn:
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1749 matchfn = self.matchfn
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1750 if matchfn:
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11059 diff changeset	1751 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	1752 diff = self.diffopts.get('patch')
23691 e41bcb019633 cmdutil.changeset_printer: explicitly honor all diffopts Siddharth Agarwal <sid0@fb.com> parents: 23686 diff changeset	1753 diffopts = patch.diffallopts(self.ui, self.diffopts)
27065 93bcc73df8d5 cmdutil.changeset_printer: pass context into showpatch() Gregory Szorc <gregory.szorc@gmail.com> parents: 26938 diff changeset	1754 node = ctx.node()
27622 0bc71f45d362 cmdutil: pass node instead of ctx to diffordiffstat Durham Goode <durham@fb.com> parents: 27613 diff changeset	1755 prev = ctx.p1().node()
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1756 if stat:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1757 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	1758 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	1759 if diff:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1760 if stat:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	1761 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	1762 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	1763 match=matchfn, stat=False)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1764 self.ui.write("\n")
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1765
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1766 class jsonchangeset(changeset_printer):
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1767 '''format changeset information.'''
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1768
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1769 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	1770 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	1771 self.cache = {}
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1772 self._first = True
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1773
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1774 def close(self):
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1775 if not self._first:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1776 self.ui.write("\n]\n")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1777 else:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1778 self.ui.write("[]\n")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1779
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1780 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	1781 '''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	1782 rev = ctx.rev()
24602 201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1783 if rev is None:
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1784 jrev = jnode = 'null'
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1785 else:
32155 055cca8e167b py3: use %d to format integers into bytestrings Pulkit Goyal <7895pulkit@gmail.com> parents: 32153 diff changeset	1786 jrev = '%d' % rev
24602 201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	1787 jnode = '"%s"' % hex(ctx.node())
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1788 j = encoding.jsonescape
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1789
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1790 if self._first:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1791 self.ui.write("[\n {")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1792 self._first = False
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1793 else:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1794 self.ui.write(",\n {")
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1795
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1796 if self.ui.quiet:
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1797 self.ui.write(('\n "rev": %s') % jrev)
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1798 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	1799 self.ui.write('\n }')
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1800 return
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1801
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1802 self.ui.write(('\n "rev": %s') % jrev)
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1803 self.ui.write((',\n "node": %s') % jnode)
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1804 self.ui.write((',\n "branch": "%s"') % j(ctx.branch()))
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1805 self.ui.write((',\n "phase": "%s"') % ctx.phasestr())
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1806 self.ui.write((',\n "user": "%s"') % j(ctx.user()))
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1807 self.ui.write((',\n "date": [%d, %d]') % ctx.date())
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1808 self.ui.write((',\n "desc": "%s"') % j(ctx.description()))
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1809
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1810 self.ui.write((',\n "bookmarks": [%s]') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1811 ", ".join('"%s"' % j(b) for b in ctx.bookmarks()))
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1812 self.ui.write((',\n "tags": [%s]') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1813 ", ".join('"%s"' % j(t) for t in ctx.tags()))
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1814 self.ui.write((',\n "parents": [%s]') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1815 ", ".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	1816
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1817 if self.ui.debugflag:
24603 e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1818 if rev is None:
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1819 jmanifestnode = 'null'
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1820 else:
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	1821 jmanifestnode = '"%s"' % hex(ctx.manifestnode())
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1822 self.ui.write((',\n "manifest": %s') % jmanifestnode)
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1823
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1824 self.ui.write((',\n "extra": {%s}') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1825 ", ".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	1826 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	1827
23734 f4e6475950f1 cmdutil.jsonchangeset: properly compute added and removed files Gregory Szorc <gregory.szorc@gmail.com> parents: 23501 diff changeset	1828 files = ctx.p1().status(ctx)
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1829 self.ui.write((',\n "modified": [%s]') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1830 ", ".join('"%s"' % j(f) for f in files[0]))
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1831 self.ui.write((',\n "added": [%s]') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1832 ", ".join('"%s"' % j(f) for f in files[1]))
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1833 self.ui.write((',\n "removed": [%s]') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1834 ", ".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	1835
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1836 elif self.ui.verbose:
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1837 self.ui.write((',\n "files": [%s]') %
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1838 ", ".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	1839
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1840 if copies:
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1841 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	1842 ", ".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	1843 for k, v in copies))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1844
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1845 matchfn = self.matchfn
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1846 if matchfn:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1847 stat = self.diffopts.get('stat')
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1848 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	1849 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	1850 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	1851 if stat:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1852 self.ui.pushbuffer()
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1853 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	1854 match=matchfn, stat=True)
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1855 self.ui.write((',\n "diffstat": "%s"')
844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1856 % j(self.ui.popbuffer()))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1857 if diff:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1858 self.ui.pushbuffer()
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1859 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	1860 match=matchfn, stat=False)
29397 844f72885fb9 check-code: detect "missing _() in ui message" more exactly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29346 diff changeset	1861 self.ui.write((',\n "diff": "%s"') % j(self.ui.popbuffer()))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1862
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	1863 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	1864
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	1865 class changeset_templater(changeset_printer):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1866 '''format changeset information.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1867
33045 99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32953 diff changeset	1868 # Arguments before "buffered" used to be positional. Consider not
99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32953 diff changeset	1869 # adding/removing arguments before "buffered" to not break callers.
99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32953 diff changeset	1870 def __init__(self, ui, repo, tmplspec, matchfn=None, diffopts=None,
99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32953 diff changeset	1871 buffered=False):
99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32953 diff changeset	1872 diffopts = diffopts or {}
99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32953 diff changeset	1873
22386 54e614a297ac cmdutil: avoid the confusing name 'patch' for a matcher Martin von Zweigbergk <martinvonz@gmail.com> parents: 22374 diff changeset	1874 changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
32840 57c13c0d1cde formatter: put topic in templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32839 diff changeset	1875 self.t = formatter.loadtemplater(ui, tmplspec,
32832 11e667a8fcba formatter: factor out function to create templater from literal or map file Yuya Nishihara <yuya@tcha.org> parents: 32831 diff changeset	1876 cache=templatekw.defaulttempl)
31807 e6eb86b154c5 templater: provide loop counter as "index" keyword Yuya Nishihara <yuya@tcha.org> parents: 31698 diff changeset	1877 self._counter = itertools.count()
20667 e96e9f805c19 changeset_templater: remove use_template method Matt Mackall <mpm@selenic.com> parents: 20666 diff changeset	1878 self.cache = {}
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1879
32842 97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32840 diff changeset	1880 self._tref = tmplspec.ref
97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32840 diff changeset	1881 self._parts = {'header': '', 'footer': '',
97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32840 diff changeset	1882 tmplspec.ref: tmplspec.ref,
32951 050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1883 'docheader': '', 'docfooter': '',
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1884 'separator': ''}
32947 3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1885 if tmplspec.mapfile:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1886 # find correct templates for current mode, for backward
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1887 # compatibility with 'log -v/-q/--debug' using a mapfile
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1888 tmplmodes = [
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1889 (True, ''),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1890 (self.ui.verbose, '_verbose'),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1891 (self.ui.quiet, '_quiet'),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1892 (self.ui.debugflag, '_debug'),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1893 ]
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1894 for mode, postfix in tmplmodes:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1895 for t in self._parts:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1896 cur = t + postfix
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1897 if mode and cur in self.t:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32946 diff changeset	1898 self._parts[t] = cur
32953 6d79e9109908 changeset_templater: backport parts map of [templates] section from formatter Yuya Nishihara <yuya@tcha.org> parents: 32951 diff changeset	1899 else:
6d79e9109908 changeset_templater: backport parts map of [templates] section from formatter Yuya Nishihara <yuya@tcha.org> parents: 32951 diff changeset	1900 partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
6d79e9109908 changeset_templater: backport parts map of [templates] section from formatter Yuya Nishihara <yuya@tcha.org> parents: 32951 diff changeset	1901 m = formatter.templatepartsmap(tmplspec, self.t, partnames)
6d79e9109908 changeset_templater: backport parts map of [templates] section from formatter Yuya Nishihara <yuya@tcha.org> parents: 32951 diff changeset	1902 self._parts.update(m)
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	1903
26222 3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1904 if self._parts['docheader']:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1905 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	1906
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1907 def close(self):
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1908 if self._parts['docfooter']:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1909 if not self.footer:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1910 self.footer = ""
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	1911 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	1912 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	1913
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1914 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	1915 '''show a single changeset or file revision'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1916 props = props.copy()
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	1917 props.update(templatekw.keywords)
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	1918 props['templ'] = self.t
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	1919 props['ctx'] = ctx
10055 e400a511e63a cmdutil: extract repo dependent closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10054 diff changeset	1920 props['repo'] = self.repo
28384 3356bf61fa25 formatter: make labels work with templated output Kostia Balytskyi <ikostia@fb.com> parents: 28375 diff changeset	1921 props['ui'] = self.repo.ui
32951 050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1922 props['index'] = index = next(self._counter)
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	1923 props['revcache'] = {'copies': copies}
10057 babc00a82c5e cmdutil: extract latest tags closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10056 diff changeset	1924 props['cache'] = self.cache
32289 770bbfdc9644 py3: convert kwargs' keys to str using pycompat.strkwargs Pulkit Goyal <7895pulkit@gmail.com> parents: 32174 diff changeset	1925 props = pycompat.strkwargs(props)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1926
32951 050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1927 # write separator, which wouldn't work well with the header part below
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1928 # since there's inherently a conflict between header (across items) and
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1929 # separator (per item)
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1930 if self._parts['separator'] and index > 0:
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1931 self.ui.write(templater.stringify(self.t(self._parts['separator'])))
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32947 diff changeset	1932
28837 d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1933 # write header
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1934 if self._parts['header']:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1935 h = templater.stringify(self.t(self._parts['header'], **props))
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1936 if self.buffered:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1937 self.header[ctx.rev()] = h
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1938 else:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1939 if self.lastheader != h:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1940 self.lastheader = h
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1941 self.ui.write(h)
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1942
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1943 # write changeset metadata, then patch if requested
32842 97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32840 diff changeset	1944 key = self._parts[self._tref]
28837 d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1945 self.ui.write(templater.stringify(self.t(key, **props)))
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1946 self.showpatch(ctx, matchfn)
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1947
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1948 if self._parts['footer']:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1949 if not self.footer:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1950 self.footer = templater.stringify(
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	1951 self.t(self._parts['footer'], **props))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1952
32840 57c13c0d1cde formatter: put topic in templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32839 diff changeset	1953 def logtemplatespec(tmpl, mapfile):
32875 c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32873 diff changeset	1954 if mapfile:
c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32873 diff changeset	1955 return formatter.templatespec('changeset', tmpl, mapfile)
c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32873 diff changeset	1956 else:
c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32873 diff changeset	1957 return formatter.templatespec('', tmpl, None)
32838 615ec3f14aa9 formatter: wrap (tmpl, mapfile) by named tuple Yuya Nishihara <yuya@tcha.org> parents: 32837 diff changeset	1958
32834 edde2e974ed0 cmdutil: rename gettemplate() to _lookuplogtemplate() Yuya Nishihara <yuya@tcha.org> parents: 32832 diff changeset	1959 def _lookuplogtemplate(ui, tmpl, style):
32835 9d76812f9b0b formatter: document lookuptemplate() Yuya Nishihara <yuya@tcha.org> parents: 32834 diff changeset	1960 """Find the template matching the given template spec or style
9d76812f9b0b formatter: document lookuptemplate() Yuya Nishihara <yuya@tcha.org> parents: 32834 diff changeset	1961
9d76812f9b0b formatter: document lookuptemplate() Yuya Nishihara <yuya@tcha.org> parents: 32834 diff changeset	1962 See formatter.lookuptemplate() for details.
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1963 """
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1964
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1965 # ui settings
22582 4fe5fa49eac8 templater: fix precedence of --style and --template options Yuya Nishihara <yuya@tcha.org> parents: 22303 diff changeset	1966 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	1967 tmpl = ui.config('ui', 'logtemplate')
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1968 if tmpl:
32838 615ec3f14aa9 formatter: wrap (tmpl, mapfile) by named tuple Yuya Nishihara <yuya@tcha.org> parents: 32837 diff changeset	1969 return logtemplatespec(templater.unquotestring(tmpl), None)
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1970 else:
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33438 diff changeset	1971 style = util.expandpath(ui.config('ui', 'style'))
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1972
22582 4fe5fa49eac8 templater: fix precedence of --style and --template options Yuya Nishihara <yuya@tcha.org> parents: 22303 diff changeset	1973 if not tmpl and style:
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1974 mapfile = style
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1975 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	1976 mapname = (templater.templatepath('map-cmdline.' + mapfile)
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1977 or templater.templatepath(mapfile))
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1978 if mapname:
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1979 mapfile = mapname
32838 615ec3f14aa9 formatter: wrap (tmpl, mapfile) by named tuple Yuya Nishihara <yuya@tcha.org> parents: 32837 diff changeset	1980 return logtemplatespec(None, mapfile)
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	1981
20668 3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	1982 if not tmpl:
32838 615ec3f14aa9 formatter: wrap (tmpl, mapfile) by named tuple Yuya Nishihara <yuya@tcha.org> parents: 32837 diff changeset	1983 return logtemplatespec(None, None)
20668 3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	1984
25511 c2a4dfe2a336 formatter: move most of template option helper to formatter Matt Mackall <mpm@selenic.com> parents: 25439 diff changeset	1985 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	1986
32837 50586a0a946f cmdutil: factor out helper to create changeset_templater with literal template Yuya Nishihara <yuya@tcha.org> parents: 32835 diff changeset	1987 def makelogtemplater(ui, repo, tmpl, buffered=False):
50586a0a946f cmdutil: factor out helper to create changeset_templater with literal template Yuya Nishihara <yuya@tcha.org> parents: 32835 diff changeset	1988 """Create a changeset_templater from a literal template 'tmpl'"""
32839 b425ec7fb7f6 cmdutil: pass templatespec tuple directly to changeset_templater (API) Yuya Nishihara <yuya@tcha.org> parents: 32838 diff changeset	1989 spec = logtemplatespec(tmpl, None)
33045 99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32953 diff changeset	1990 return changeset_templater(ui, repo, spec, buffered=buffered)
32837 50586a0a946f cmdutil: factor out helper to create changeset_templater with literal template Yuya Nishihara <yuya@tcha.org> parents: 32835 diff changeset	1991
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1992 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	1993 """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	1994
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1995 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	1996 1. option 'template'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1997 2. option 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1998 3. [ui] setting 'logtemplate'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1999 4. [ui] setting 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	2000 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	2001 regular display via changeset_printer() is done.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	2002 """
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	2003 # options
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 34081 diff changeset	2004 match = None
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11059 diff changeset	2005 if opts.get('patch') or opts.get('stat'):
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 34081 diff changeset	2006 match = 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	2007
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	2008 if opts.get('template') == 'json':
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 34081 diff changeset	2009 return jsonchangeset(ui, repo, match, 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	2010
32834 edde2e974ed0 cmdutil: rename gettemplate() to _lookuplogtemplate() Yuya Nishihara <yuya@tcha.org> parents: 32832 diff changeset	2011 spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style'))
32839 b425ec7fb7f6 cmdutil: pass templatespec tuple directly to changeset_templater (API) Yuya Nishihara <yuya@tcha.org> parents: 32838 diff changeset	2012
32875 c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32873 diff changeset	2013 if not spec.ref and not spec.tmpl and not spec.mapfile:
34083 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 34081 diff changeset	2014 return changeset_printer(ui, repo, match, opts, buffered)
08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 34081 diff changeset	2015
08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 34081 diff changeset	2016 return changeset_templater(ui, repo, spec, match, opts, buffered)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	2017
29795 142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2018 def showmarker(fm, marker, index=None):
20470 78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	2019 """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	2020
78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	2021 To be used by debug function."""
28613 6433da9c96a9 debugobsolete: add an option to show marker index Kostia Balytskyi <ikostia@fb.com> parents: 28608 diff changeset	2022 if index is not None:
29795 142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2023 fm.write('index', '%i ', index)
33856 eae63a9e59da obsmarker: precnode was renamed into prednode Boris Feld <boris.feld@octobus.net> parents: 33824 diff changeset	2024 fm.write('prednode', '%s ', hex(marker.prednode()))
29795 142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2025 succs = marker.succnodes()
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2026 fm.condwrite(succs, 'succnodes', '%s ',
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2027 fm.formatlist(map(hex, succs), name='node'))
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2028 fm.write('flag', '%X ', marker.flags())
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22250 diff changeset	2029 parents = marker.parentnodes()
2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22250 diff changeset	2030 if parents is not None:
29795 142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2031 fm.write('parentnodes', '{%s} ',
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2032 fm.formatlist(map(hex, parents), name='node', sep=', '))
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2033 fm.write('date', '(%s) ', fm.formatdate(marker.date()))
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2034 meta = marker.metadata().copy()
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2035 meta.pop('date', None)
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2036 fm.write('metadata', '{%s}', fm.formatdict(meta, fmt='%r: %r', sep=', '))
142ae01820a3 debugobsolete: add formatter support (issue5134) Yuya Nishihara <yuya@tcha.org> parents: 29758 diff changeset	2037 fm.plain('\n')
20470 78f4c2b7052f debugobsolete: extract marker display in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20392 diff changeset	2038
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	2039 def finddate(ui, repo, date):
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	2040 """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	2041
5836 c5c9a022bd9a Tweak finddate to pass date directly. mark.williamson@cl.cam.ac.uk parents: 5829 diff changeset	2042 df = util.matchdate(date)
14322 a90131b85fd8 scmutil: drop aliases in cmdutil for match functions Matt Mackall <mpm@selenic.com> parents: 14321 diff changeset	2043 m = scmutil.matchall(repo)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	2044 results = {}
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2045
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2046 def prep(ctx, fns):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2047 d = ctx.date()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2048 if df(d[0]):
9668 2c24471d478c cmdutil: fix bug in finddate() implementation Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9667 diff changeset	2049 results[ctx.rev()] = d
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2050
9667 8743f2e1bc54 merge changes from mpm Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9666 9665 diff changeset	2051 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	2052 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2053 if rev in results:
16937 5487088f0d43 cmdutil: lowercase finddate status message Martin Geisler <mg@aragost.com> parents: 16776 diff changeset	2054 ui.status(_("found revision %s from %s\n") %
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2055 (rev, util.datestr(results[rev])))
32155 055cca8e167b py3: use %d to format integers into bytestrings Pulkit Goyal <7895pulkit@gmail.com> parents: 32153 diff changeset	2056 return '%d' % rev
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	2057
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	2058 raise error.Abort(_("revision matching date not found"))
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	2059
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2060 def increasingwindows(windowsize=8, sizelimit=512):
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2061 while True:
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2062 yield windowsize
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2063 if windowsize < sizelimit:
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2064 windowsize *= 2
16776 5088d0b9a9a1 cmdutil: extract increasing_windows() from walkchangerevs() Patrick Mezard <patrick@mezard.eu> parents: 16701 diff changeset	2065
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2066 class FileWalkError(Exception):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2067 pass
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2068
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2069 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	2070 '''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	2071
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2072 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	2073
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2074 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	2075 filelogs alone.
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2076 '''
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2077 wanted = set()
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2078 copies = []
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2079 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	2080 def filerevgen(filelog, last):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2081 """
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2082 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	2083
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2084 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	2085 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	2086 tuples in backwards order
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2087 """
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2088 cl_count = len(repo)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2089 revs = []
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2090 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	2091 linkrev = filelog.linkrev(j)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2092 if linkrev < minrev:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2093 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2094 # 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	2095 # 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	2096 if linkrev >= cl_count:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2097 break
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2098
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2099 parentlinkrevs = []
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2100 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	2101 if p != nullrev:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2102 parentlinkrevs.append(filelog.linkrev(p))
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2103 n = filelog.node(j)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2104 revs.append((linkrev, parentlinkrevs,
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2105 follow and filelog.renamed(n)))
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2106
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2107 return reversed(revs)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2108 def iterfiles():
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2109 pctx = repo['.']
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2110 for filename in match.files():
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2111 if follow:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2112 if filename not in pctx:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	2113 raise error.Abort(_('cannot follow file not in parent '
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2114 'revision: "%s"') % filename)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2115 yield filename, pctx[filename].filenode()
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2116 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2117 yield filename, None
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2118 for filename_node in copies:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2119 yield filename_node
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2120
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2121 for file_, node in iterfiles():
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2122 filelog = repo.file(file_)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2123 if not len(filelog):
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2124 if node is None:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2125 # 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	2126 # 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	2127 if follow:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	2128 raise error.Abort(
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2129 _('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	2130 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	2131 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2132 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2133
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2134 if node is None:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2135 last = len(filelog) - 1
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2136 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2137 last = filelog.rev(node)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2138
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2139 # keep track of all ancestors of the file
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32289 diff changeset	2140 ancestors = {filelog.linkrev(last)}
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2141
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2142 # 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	2143 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	2144 if not follow:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2145 if rev > maxrev:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2146 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2147 else:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2148 # 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	2149 # rev to us:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2150 # 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	2151 # 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	2152 # to explore the file graph
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2153 if rev not in ancestors:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2154 continue
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2155 # XXX insert 1327 fix here
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2156 if flparentlinkrevs:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2157 ancestors.update(flparentlinkrevs)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2158
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2159 fncache.setdefault(rev, []).append(file_)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2160 wanted.add(rev)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2161 if copied:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2162 copies.append(copied)
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2163
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2164 return wanted
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2165
24391 6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2166 class _followfilter(object):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2167 def __init__(self, repo, onlyfirst=False):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2168 self.repo = repo
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2169 self.startrev = nullrev
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2170 self.roots = set()
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2171 self.onlyfirst = onlyfirst
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2172
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2173 def match(self, rev):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2174 def realparents(rev):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2175 if self.onlyfirst:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2176 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	2177 else:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2178 return filter(lambda x: x != nullrev,
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2179 self.repo.changelog.parentrevs(rev))
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2180
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2181 if self.startrev == nullrev:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2182 self.startrev = rev
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2183 return True
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2184
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2185 if rev > self.startrev:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2186 # forward: all descendants
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2187 if not self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2188 self.roots.add(self.startrev)
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2189 for parent in realparents(rev):
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2190 if parent in self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2191 self.roots.add(rev)
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2192 return True
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2193 else:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2194 # backwards: all parents
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2195 if not self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2196 self.roots.update(realparents(self.startrev))
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2197 if rev in self.roots:
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2198 self.roots.remove(rev)
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2199 self.roots.update(realparents(rev))
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2200 return True
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2201
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2202 return False
6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2203
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	2204 def walkchangerevs(repo, match, opts, prepare):
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	2205 '''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	2206
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2207 Callers most commonly need to iterate backwards over the history
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	2208 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	2209 performance, so we use iterators in a "windowed" way.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2210
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2211 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	2212 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	2213 order (usually backwards) to display it.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2214
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2215 This function returns an iterator yielding contexts. Before
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2216 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	2217 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	2218
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2219 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	2220 revs = _logrevs(repo, opts)
11281 b724b8467b82 walkchangerevs: allow empty query sets Matt Mackall <mpm@selenic.com> parents: 11277 diff changeset	2221 if not revs:
b724b8467b82 walkchangerevs: allow empty query sets Matt Mackall <mpm@selenic.com> parents: 11277 diff changeset	2222 return []
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	2223 wanted = set()
25272 6c76c42a5893 walkchangerevs: avoid match.files() in conditions Martin von Zweigbergk <martinvonz@google.com> parents: 25271 diff changeset	2224 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	2225 opts.get('removed'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2226 fncache = {}
16108 f7e0d95d0a0b log: remove caching of all visited revisions (issue3253) Matt Mackall <mpm@selenic.com> parents: 16070 diff changeset	2227 change = repo.changectx
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2228
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	2229 # 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	2230 # 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	2231 # 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	2232 # match the file filtering conditions.
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	2233
24384 5cb459dc32d2 walkchangerevs: simplify by using match.always() method Martin von Zweigbergk <martinvonz@google.com> parents: 24379 diff changeset	2234 if match.always():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2235 # No files, no patterns. Display all revs.
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2236 wanted = revs
25271 1b1eaf1885df walkchangerevs: simplify with an 'elif' Martin von Zweigbergk <martinvonz@google.com> parents: 25259 diff changeset	2237 elif not slowpath:
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	2238 # 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	2239
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2240 try:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2241 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	2242 except FileWalkError:
f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2243 slowpath = True
11608 183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	2244
19290 f21f4a1b6c24 log: move log file walk to its own function Durham Goode <durham@fb.com> parents: 19211 diff changeset	2245 # 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	2246 # 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	2247 # existed in history, otherwise simply return
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2248 for path in match.files():
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2249 if path == '.' or path in repo.store:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2250 break
18340 8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	2251 else:
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	2252 return []
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2253
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2254 if slowpath:
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	2255 # 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	2256 # changed files
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	2257
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2258 if follow:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	2259 raise error.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	2260 'filenames'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2261
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2262 # 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	2263 # 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	2264 class lazywantedset(object):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2265 def __init__(self):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2266 self.set = set()
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2267 self.revs = set(revs)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2268
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2269 # 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	2270 # 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	2271 def __contains__(self, value):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2272 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	2273 return True
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2274 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	2275 return False
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2276 else:
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2277 self.revs.discard(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2278 ctx = change(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2279 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	2280 if matches:
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2281 fncache[value] = matches
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2282 self.set.add(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2283 return True
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2284 return False
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2285
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2286 def discard(self, value):
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2287 self.revs.discard(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2288 self.set.discard(value)
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2289
d184bae667e4 log: make file log slow path usable on large repos Durham Goode <durham@fb.com> parents: 19511 diff changeset	2290 wanted = lazywantedset()
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2291
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2292 # 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	2293 # 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	2294 for rev in opts.get('prune', ()):
16380 84ba30e8c790 cmdutil: use context instead of lookup Matt Mackall <mpm@selenic.com> parents: 16304 diff changeset	2295 rev = repo[rev].rev()
24391 6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2296 ff = _followfilter(repo)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2297 stop = min(revs[0], revs[-1])
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	2298 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	2299 if ff.match(x):
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2300 wanted = wanted - [x]
18710 49ef9d0ca815 cmdutil: use a small initial window with --limit Bryan O'Sullivan <bryano@fb.com> parents: 18688 diff changeset	2301
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	2302 # 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	2303 # revision range, yielding only revisions in wanted.
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2304 def iterate():
25272 6c76c42a5893 walkchangerevs: avoid match.files() in conditions Martin von Zweigbergk <martinvonz@google.com> parents: 25271 diff changeset	2305 if follow and match.always():
24391 6c3a93e690c7 walkchangerevs: make followfilter a top-level class Martin von Zweigbergk <martinvonz@google.com> parents: 24384 diff changeset	2306 ff = _followfilter(repo, onlyfirst=opts.get('follow_first'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2307 def want(rev):
8119 af44d0b953c6 cmdutil: return boolean result directly in want function Martin Geisler <mg@lazybytes.net> parents: 8117 diff changeset	2308 return ff.match(rev) and rev in wanted
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2309 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2310 def want(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2311 return rev in wanted
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2312
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2313 it = iter(revs)
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2314 stopiteration = False
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2315 for windowsize in increasingwindows():
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2316 nrevs = []
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2317 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	2318 rev = next(it, None)
fb7b9a765bb9 walkchangerevs: replace try/except with 'next' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25119 diff changeset	2319 if rev is None:
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2320 stopiteration = True
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2321 break
25147 fb7b9a765bb9 walkchangerevs: replace try/except with 'next' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25119 diff changeset	2322 elif want(rev):
fb7b9a765bb9 walkchangerevs: replace try/except with 'next' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25119 diff changeset	2323 nrevs.append(rev)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	2324 for rev in sorted(nrevs):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2325 fns = fncache.get(rev)
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	2326 ctx = change(rev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2327 if not fns:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2328 def fns_generator():
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	2329 for f in ctx.files():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	2330 if match(f):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2331 yield f
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2332 fns = fns_generator()
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2333 prepare(ctx, fns)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	2334 for rev in nrevs:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2335 yield change(rev)
20553 86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2336
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2337 if stopiteration:
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2338 break
86cefb15e7b5 cmdutil: implemented new lazy increasingwindows Lucas Moscovicz <lmoscovicz@fb.com> parents: 20500 diff changeset	2339
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	2340 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	2341
22166 ac7a3b2a85e3 cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher Siddharth Agarwal <sid0@fb.com> parents: 21966 diff changeset	2342 def _makefollowlogfilematcher(repo, files, followfirst):
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2343 # 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	2344 # 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	2345 # --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	2346 # 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	2347 # reproducing the graph traversal already done by --follow revset
30016 2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 30015 diff changeset	2348 # and relating revs to file names (which is not "correct" but
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2349 # good enough).
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2350 fcache = {}
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2351 fcacheready = [False]
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2352 pctx = repo['.']
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2353
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2354 def populate():
21876 584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 21825 diff changeset	2355 for fn in files:
30015 96b2dd3b184d log: unroll loop that populates file paths for --patch --follow matcher Yuya Nishihara <yuya@tcha.org> parents: 30004 diff changeset	2356 fctx = pctx[fn]
30016 2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 30015 diff changeset	2357 fcache.setdefault(fctx.introrev(), set()).add(fctx.path())
30015 96b2dd3b184d log: unroll loop that populates file paths for --patch --follow matcher Yuya Nishihara <yuya@tcha.org> parents: 30004 diff changeset	2358 for c in fctx.ancestors(followfirst=followfirst):
30016 2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 30015 diff changeset	2359 fcache.setdefault(c.rev(), set()).add(c.path())
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2360
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2361 def filematcher(rev):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2362 if not fcacheready[0]:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2363 # Lazy initialization
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2364 fcacheready[0] = True
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2365 populate()
21878 e2530d4a47c1 log: use an exact matcher for --patch --follow Siddharth Agarwal <sid0@fb.com> parents: 21877 diff changeset	2366 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	2367
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2368 return filematcher
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2369
22167 d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	2370 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	2371 '''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	2372 return None
d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	2373
21108 e5ad36a845af cmdutil: changed _makegraphlogrevset to _makelogrevset Lucas Moscovicz <lmoscovicz@fb.com> parents: 21051 diff changeset	2374 def _makelogrevset(repo, pats, opts, revs):
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2375 """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	2376 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	2377 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	2378 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	2379 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	2380 """
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2381 opt2revset = {
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2382 'no_merges': ('not merge()', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2383 'only_merges': ('merge()', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2384 '_ancestors': ('ancestors(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2385 '_fancestors': ('_firstancestors(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2386 '_descendants': ('descendants(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2387 '_fdescendants': ('_firstdescendants(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2388 '_matchfiles': ('_matchfiles(%(val)s)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2389 'date': ('date(%(val)r)', None),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2390 'branch': ('branch(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2391 '_patslog': ('filelog(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2392 '_patsfollow': ('follow(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2393 '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2394 'keyword': ('keyword(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2395 '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	2396 'user': ('user(%(val)r)', ' or '),
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2397 }
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2398
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2399 opts = dict(opts)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2400 # follow or not follow?
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2401 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	2402 if opts.get('follow_first'):
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	2403 followfirst = 1
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	2404 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24301 diff changeset	2405 followfirst = 0
26098 ce26928cbe41 spelling: behaviour -> behavior timeless@mozdev.org parents: 26086 diff changeset	2406 # --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	2407 it = iter(revs)
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 29137 diff changeset	2408 startrev = next(it)
25168 4dfd4d3b9b93 _makelogrevset: replace try/except with 'next' usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 25147 diff changeset	2409 followdescendants = startrev < next(it, startrev)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2410
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2411 # 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	2412 # the same time
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2413 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	2414 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	2415 # 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	2416 # _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	2417 # 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	2418 # 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	2419 wctx = repo[None]
1925769b4ff8 log: prefer 'wctx' over 'pctx' for working context Martin von Zweigbergk <martinvonz@google.com> parents: 24485 diff changeset	2420 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	2421 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	2422 opts.get('removed'))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2423 if not slowpath:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2424 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	2425 if follow and f not in wctx:
21998 739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2426 # 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	2427 # take the slow path.
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2428 if os.path.exists(repo.wjoin(f)):
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2429 slowpath = True
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2430 continue
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2431 else:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	2432 raise error.Abort(_('cannot follow file not in parent '
21998 739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2433 'revision: "%s"') % f)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2434 filelog = repo.file(f)
19293 446ab88d3f1c filelog: switch 'not len(filerevlog)' to 'not filerevlog' Durham Goode <durham@fb.com> parents: 19290 diff changeset	2435 if not filelog:
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2436 # 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	2437 # 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	2438 if follow:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	2439 raise error.Abort(
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2440 _('cannot follow nonexistent file: "%s"') % f)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2441 slowpath = True
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2442
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2443 # 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	2444 # 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	2445 # 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	2446 # slowpath; otherwise, we can turn off the slowpath
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2447 if slowpath:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2448 for path in match.files():
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2449 if path == '.' or path in repo.store:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2450 break
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2451 else:
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2452 slowpath = False
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	2453
23500 9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	2454 fpats = ('_patsfollow', '_patsfollowfirst')
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	2455 fnopats = (('_ancestors', '_fancestors'),
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	2456 ('_descendants', '_fdescendants'))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2457 if slowpath:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2458 # See walkchangerevs() slow path.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2459 #
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2460 # 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	2461 # 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	2462 # 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	2463 # "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	2464 # 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	2465 # directory.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2466 matchargs = ['r:', 'd:relpath']
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2467 for p in pats:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2468 matchargs.append('p:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2469 for p in opts.get('include', []):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2470 matchargs.append('i:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2471 for p in opts.get('exclude', []):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2472 matchargs.append('x:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2473 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	2474 opts['_matchfiles'] = matchargs
23500 9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	2475 if follow:
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23403 diff changeset	2476 opts[fnopats[0][followfirst]] = '.'
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2477 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2478 if follow:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2479 if pats:
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17391 diff changeset	2480 # 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	2481 # 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	2482 opts[fpats[followfirst]] = list(match.files())
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2483 else:
23955 8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision Yuya Nishihara <yuya@tcha.org> parents: 23885 diff changeset	2484 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	2485 opts[op] = 'rev(%d)' % startrev
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2486 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2487 opts['_patslog'] = list(pats)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2488
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2489 filematcher = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2490 if opts.get('patch') or opts.get('stat'):
21998 739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2491 # When following files, track renames via a special matcher.
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	2492 # 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	2493 # 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	2494 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	2495 # _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	2496 # 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	2497 filematcher = _makefollowlogfilematcher(repo, match.files(),
ac7a3b2a85e3 cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher Siddharth Agarwal <sid0@fb.com> parents: 21966 diff changeset	2498 followfirst)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2499 else:
22167 d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	2500 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	2501 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	2502 filematcher = lambda rev: match
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2503
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2504 expr = []
23501 424d669118d3 log: fix log revset instability Durham Goode <durham@fb.com> parents: 23500 diff changeset	2505 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	2506 if not val:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2507 continue
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2508 if op not in opt2revset:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2509 continue
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2510 revop, andor = opt2revset[op]
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2511 if '%(val)' not in revop:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2512 expr.append(revop)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2513 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2514 if not isinstance(val, list):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2515 e = revop % {'val': val}
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2516 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2517 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	2518 expr.append(e)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2519
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2520 if expr:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2521 expr = '(' + ' and '.join(expr) + ')'
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2522 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2523 expr = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2524 return expr, filematcher
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2525
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2526 def _logrevs(repo, opts):
26098 ce26928cbe41 spelling: behaviour -> behavior timeless@mozdev.org parents: 26086 diff changeset	2527 # 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	2528 # depends on revisions resolved from --rev...
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2529 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	2530 if opts.get('rev'):
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2531 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	2532 elif follow and repo.dirstate.p1() == nullid:
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30877 diff changeset	2533 revs = smartset.baseset()
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2534 elif follow:
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2535 revs = repo.revs('reverse(:.)')
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2536 else:
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30877 diff changeset	2537 revs = smartset.spanset(repo)
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2538 revs.reverse()
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2539 return revs
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2540
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2541 def getgraphlogrevs(repo, pats, opts):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2542 """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	2543 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	2544 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	2545 --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	2546 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	2547 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	2548 """
18172 e6c5e0092469 cmdutil: make getgraphlogrevs limit-aware Siddharth Agarwal <sid0@fb.com> parents: 18171 diff changeset	2549 limit = loglimit(opts)
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2550 revs = _logrevs(repo, opts)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2551 if not revs:
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30877 diff changeset	2552 return smartset.baseset(), None, None
21108 e5ad36a845af cmdutil: changed _makegraphlogrevset to _makelogrevset Lucas Moscovicz <lmoscovicz@fb.com> parents: 21051 diff changeset	2553 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	2554 if opts.get('rev'):
eb1c9700d19d graphlog: move comment and flag denoting revs might be unsorted Yuya Nishihara <yuya@tcha.org> parents: 24059 diff changeset	2555 # 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	2556 # _makelogrevset because it might depend on the order of revs
29346 38e0c83c7ee4 revset: record if a set is in topographical order Martijn Pieters <mjpieters@fb.com> parents: 29335 diff changeset	2557 if not (revs.isdescending() or revs.istopo()):
29335 631617262e55 graphmod: avoid sorting when already sorted Martijn Pieters <mjpieters@fb.com> parents: 29327 diff changeset	2558 revs.sort(reverse=True)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2559 if expr:
34018 de286200f722 revset: move order argument to run-time match function Yuya Nishihara <yuya@tcha.org> parents: 34013 diff changeset	2560 matcher = revset.match(repo.ui, expr)
34019 205c47e30a93 revset: make match function follow given subset if specified (API) Yuya Nishihara <yuya@tcha.org> parents: 34018 diff changeset	2561 revs = matcher(repo, revs)
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	2562 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	2563 limitedrevs = []
20755 cfd03c069e08 cmdutil: changed code in getgraphlogrevs not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20710 diff changeset	2564 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	2565 if idx >= limit:
cfd03c069e08 cmdutil: changed code in getgraphlogrevs not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20710 diff changeset	2566 break
cfd03c069e08 cmdutil: changed code in getgraphlogrevs not to use getitem Lucas Moscovicz <lmoscovicz@fb.com> parents: 20710 diff changeset	2567 limitedrevs.append(rev)
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30877 diff changeset	2568 revs = smartset.baseset(limitedrevs)
18172 e6c5e0092469 cmdutil: make getgraphlogrevs limit-aware Siddharth Agarwal <sid0@fb.com> parents: 18171 diff changeset	2569
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2570 return revs, expr, filematcher
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2571
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2572 def getlogrevs(repo, pats, opts):
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2573 """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	2574 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	2575 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	2576 --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	2577 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	2578 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	2579 """
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2580 limit = loglimit(opts)
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	2581 revs = _logrevs(repo, opts)
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2582 if not revs:
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30877 diff changeset	2583 return smartset.baseset([]), None, None
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2584 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2585 if expr:
34018 de286200f722 revset: move order argument to run-time match function Yuya Nishihara <yuya@tcha.org> parents: 34013 diff changeset	2586 matcher = revset.match(repo.ui, expr)
34019 205c47e30a93 revset: make match function follow given subset if specified (API) Yuya Nishihara <yuya@tcha.org> parents: 34018 diff changeset	2587 revs = matcher(repo, revs)
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2588 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	2589 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	2590 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	2591 if limit <= idx:
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2592 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	2593 limitedrevs.append(r)
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30877 diff changeset	2594 revs = smartset.baseset(limitedrevs)
21127 69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2595
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2596 return revs, expr, filematcher
69402eb72115 log: changed implementation to use graphlog code Lucas Moscovicz <lmoscovicz@fb.com> parents: 21108 diff changeset	2597
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2598 def _graphnodeformatter(ui, displayer):
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2599 spec = ui.config('ui', 'graphnodetemplate')
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2600 if not spec:
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2601 return templatekw.showgraphnode # fast path for "{graphnode}"
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2602
32045 3eceeede26e9 graphlog: optionally strip quotes from graphnode template (BC) Yuya Nishihara <yuya@tcha.org> parents: 32005 diff changeset	2603 spec = templater.unquotestring(spec)
32873 2ecce24dfcd3 templater: add simple interface for unnamed template (API) Yuya Nishihara <yuya@tcha.org> parents: 32862 diff changeset	2604 templ = formatter.maketemplater(ui, spec)
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2605 cache = {}
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2606 if isinstance(displayer, changeset_templater):
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2607 cache = displayer.cache # reuse cache of slow templates
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2608 props = templatekw.keywords.copy()
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2609 props['templ'] = templ
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2610 props['cache'] = cache
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2611 def formatnode(repo, ctx):
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2612 props['ctx'] = ctx
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2613 props['repo'] = repo
28428 6a4a4ca21907 graphlog: bring back color to node symbol template Yuya Nishihara <yuya@tcha.org> parents: 28384 diff changeset	2614 props['ui'] = repo.ui
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2615 props['revcache'] = {}
32873 2ecce24dfcd3 templater: add simple interface for unnamed template (API) Yuya Nishihara <yuya@tcha.org> parents: 32862 diff changeset	2616 return templ.render(props)
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2617 return formatnode
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2618
27213 ccae1588117f graphlog: move creation of workingdir-parent nodes to displaygraph() Yuya Nishihara <yuya@tcha.org> parents: 27155 diff changeset	2619 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None,
34189 e9898ad31115 cmdutil: allow extra properties to be added to each context Gregory Szorc <gregory.szorc@gmail.com> parents: 34121 diff changeset	2620 filematcher=None, props=None):
e9898ad31115 cmdutil: allow extra properties to be added to each context Gregory Szorc <gregory.szorc@gmail.com> parents: 34121 diff changeset	2621 props = props or {}
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2622 formatnode = _graphnodeformatter(ui, displayer)
28375 97cb1aeaca78 graphmod: refactor state handling Martijn Pieters <mjpieters@fb.com> parents: 28322 diff changeset	2623 state = graphmod.asciistate()
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28570 diff changeset	2624 styles = state['styles']
28999 790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2625
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2626 # only set graph styling if HGPLAIN is not set.
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2627 if ui.plain('graph'):
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2628 # set all edge styles to \|, the default pre-3.8 behaviour
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2629 styles.update(dict.fromkeys(styles, '\|'))
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2630 else:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2631 edgetypes = {
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2632 'parent': graphmod.PARENT,
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2633 'grandparent': graphmod.GRANDPARENT,
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2634 'missing': graphmod.MISSINGPARENT
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2635 }
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2636 for name, key in edgetypes.items():
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2637 # experimental config: experimental.graphstyle.*
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2638 styles[key] = ui.config('experimental', 'graphstyle.%s' % name,
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2639 styles[key])
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2640 if not styles[key]:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2641 styles[key] = None
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2642
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2643 # experimental config: experimental.graphshorten
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	2644 state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
28891 ac30adb260ea graphmod: shorten graph santiagopim <santiagopim@gmail.com> parents: 28861 diff changeset	2645
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2646 for rev, type, ctx, parents in dag:
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	2647 char = formatnode(repo, ctx)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2648 copies = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2649 if getrenamed and ctx.rev():
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2650 copies = []
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2651 for fn in ctx.files():
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2652 rename = getrenamed(fn, ctx.rev())
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2653 if rename:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2654 copies.append((fn, rename[0]))
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2655 revmatchfn = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2656 if filematcher is not None:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2657 revmatchfn = filematcher(ctx.rev())
33858 6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33856 diff changeset	2658 edges = edgefn(type, char, state, rev, parents)
6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33856 diff changeset	2659 firstedge = next(edges)
6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33856 diff changeset	2660 width = firstedge[2]
6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33856 diff changeset	2661 displayer.show(ctx, copies=copies, matchfn=revmatchfn,
34189 e9898ad31115 cmdutil: allow extra properties to be added to each context Gregory Szorc <gregory.szorc@gmail.com> parents: 34121 diff changeset	2662 _graphwidth=width, **props)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2663 lines = displayer.hunk.pop(rev).split('\n')
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2664 if not lines[-1]:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2665 del lines[-1]
25763 60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	2666 displayer.flush(ctx)
33858 6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33856 diff changeset	2667 for type, char, width, coldata in itertools.chain([firstedge], edges):
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2668 graphmod.ascii(ui, state, type, char, lines, coldata)
33858 6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33856 diff changeset	2669 lines = []
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2670 displayer.close()
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	2671
31486 06d3c40fc3e7 graphlog: pass function arguments without expansion Yuya Nishihara <yuya@tcha.org> parents: 31457 diff changeset	2672 def graphlog(ui, repo, pats, opts):
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2673 # Parameters are identical to log command ones
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2674 revs, expr, filematcher = getgraphlogrevs(repo, pats, opts)
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2675 revdag = graphmod.dagwalker(repo, revs)
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2676
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2677 getrenamed = None
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2678 if opts.get('copies'):
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2679 endrev = None
6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2680 if opts.get('rev'):
20760 d5fa413346e7 cmdutil: changed max method for lazy call Lucas Moscovicz <lmoscovicz@fb.com> parents: 20759 diff changeset	2681 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	2682 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
31078 a113284f54a0 graphlog: restore pager lost at 1cec1d863008 Yuya Nishihara <yuya@tcha.org> parents: 31023 diff changeset	2683
a113284f54a0 graphlog: restore pager lost at 1cec1d863008 Yuya Nishihara <yuya@tcha.org> parents: 31023 diff changeset	2684 ui.pager('log')
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2685 displayer = show_changeset(ui, repo, opts, buffered=True)
27213 ccae1588117f graphlog: move creation of workingdir-parent nodes to displaygraph() Yuya Nishihara <yuya@tcha.org> parents: 27155 diff changeset	2686 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed,
ccae1588117f graphlog: move creation of workingdir-parent nodes to displaygraph() Yuya Nishihara <yuya@tcha.org> parents: 27155 diff changeset	2687 filematcher)
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	2688
17182 cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2689 def checkunsupportedgraphflags(pats, opts):
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2690 for op in ["newest_first"]:
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2691 if op in opts and opts[op]:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	2692 raise error.Abort(_("-G/--graph option is incompatible with --%s")
17182 cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2693 % op.replace("_", "-"))
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2694
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2695 def graphrevs(repo, nodes, opts):
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2696 limit = loglimit(opts)
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2697 nodes.reverse()
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2698 if limit is not None:
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2699 nodes = nodes[:limit]
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2700 return graphmod.nodes(repo, nodes)
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	2701
23885 9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2702 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	2703 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	2704 bad = []
25436 9724cbe2d546 add: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25424 diff changeset	2705
9724cbe2d546 add: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25424 diff changeset	2706 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	2707 names = []
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2708 wctx = repo[None]
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2709 cca = None
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2710 abort, warn = scmutil.checkportabilityalert(ui)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2711 if abort or warn:
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17182 diff changeset	2712 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	2713
26206 ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2714 badmatch = matchmod.badmatch(match, badfn)
ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2715 dirstate = repo.dirstate
ab1c6e4efda4 add: pass full=False to dirstate walk Durham Goode <durham@fb.com> parents: 26098 diff changeset	2716 # 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	2717 # 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	2718 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	2719 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	2720 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	2721 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	2722 if cca:
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14129 diff changeset	2723 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	2724 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	2725 if ui.verbose or not exact:
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2726 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	2727
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18340 diff changeset	2728 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	2729 sub = wctx.sub(subpath)
9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2730 try:
28017 d3f1b7ee5e70 match: rename "narrowmatcher" to "subdirmatcher" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 27985 diff changeset	2731 submatch = matchmod.subdirmatcher(subpath, match)
32147 a77e61b45384 py3: handle opts correctly for `hg add` Pulkit Goyal <7895pulkit@gmail.com> parents: 32144 diff changeset	2732 if opts.get(r'subrepos'):
23885 9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2733 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	2734 else:
23885 9994f45ba714 add: pass options via keyword args Matt Harbison <matt_harbison@yahoo.com> parents: 23876 diff changeset	2735 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	2736 except error.LookupError:
9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15231 diff changeset	2737 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	2738 % join(subpath))
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2739
32147 a77e61b45384 py3: handle opts correctly for `hg add` Pulkit Goyal <7895pulkit@gmail.com> parents: 32144 diff changeset	2740 if not opts.get(r'dry_run'):
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	2741 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	2742 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	2743 return bad
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	2744
32005 2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2745 def addwebdirpath(repo, serverpath, webconf):
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2746 webconf[serverpath] = repo.root
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2747 repo.ui.debug('adding %s = %s\n' % (serverpath, repo.root))
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2748
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2749 for r in repo.revs('filelog("path:.hgsub")'):
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2750 ctx = repo[r]
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2751 for subpath in ctx.substate:
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2752 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31807 diff changeset	2753
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2754 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	2755 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	2756 bad = []
25437 9c1bcd95b3ff forget: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25436 diff changeset	2757 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	2758 wctx = repo[None]
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2759 forgot = []
25437 9c1bcd95b3ff forget: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25436 diff changeset	2760
9c1bcd95b3ff forget: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25436 diff changeset	2761 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
32174 e4a4ebfd9d8e forget: access status fields by name, not index Martin von Zweigbergk <martinvonz@google.com> parents: 32155 diff changeset	2762 forget = sorted(s.modified + s.added + s.deleted + s.clean)
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2763 if explicitonly:
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2764 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	2765
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18340 diff changeset	2766 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	2767 sub = wctx.sub(subpath)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2768 try:
28017 d3f1b7ee5e70 match: rename "narrowmatcher" to "subdirmatcher" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 27985 diff changeset	2769 submatch = matchmod.subdirmatcher(subpath, match)
23577 597b071a0e0d subrepo: drop the 'ui' parameter to forget() Matt Harbison <matt_harbison@yahoo.com> parents: 23576 diff changeset	2770 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	2771 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	2772 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	2773 except error.LookupError:
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2774 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	2775 % join(subpath))
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2776
16070 f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	2777 if not explicitonly:
f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	2778 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	2779 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	2780 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	2781 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	2782 # 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	2783 # 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	2784 # 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	2785 # 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	2786 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	2787 continue
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2788 ui.warn(_('not removing %s: '
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2789 'file is already untracked\n')
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2790 % match.rel(f))
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2791 bad.append(f)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2792
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2793 for f in forget:
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2794 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	2795 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	2796
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2797 rejected = wctx.forget(forget, prefix)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2798 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	2799 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	2800 return bad, forgot
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15911 diff changeset	2801
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2802 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	2803 rev = ctx.rev()
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2804 ret = 1
24301 18b5b2c9d921 files: replace 'ctx._repo' with 'ctx.repo()' Matt Harbison <matt_harbison@yahoo.com> parents: 24275 diff changeset	2805 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	2806
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2807 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	2808 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	2809 continue
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2810 fm.startitem()
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2811 if ui.verbose:
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2812 fc = ctx[f]
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2813 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	2814 fm.data(abspath=f)
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2815 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	2816 ret = 0
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2817
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25169 diff changeset	2818 for subpath in sorted(ctx.substate):
29802 35560189677c subrepo: cleanup of subrepo filematcher logic Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29795 diff changeset	2819 submatch = matchmod.subdirmatcher(subpath, m)
35560189677c subrepo: cleanup of subrepo filematcher logic Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29795 diff changeset	2820 if (subrepos or m.exact(subpath) or any(submatch.files())):
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2821 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	2822 try:
28387 97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 28253 diff changeset	2823 recurse = m.exact(subpath) or subrepos
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 28253 diff changeset	2824 if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2825 ret = 0
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2826 except error.LookupError:
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2827 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	2828 % m.abs(subpath))
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24391 diff changeset	2829
24275 e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2830 return ret
e1cb460a3524 files: split reusable implementation into cmdutil for subrepo support Matt Harbison <matt_harbison@yahoo.com> parents: 24272 diff changeset	2831
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2832 def remove(ui, repo, m, prefix, after, force, subrepos, warnings=None):
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2833 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	2834 ret = 0
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2835 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	2836 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	2837
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2838 wctx = repo[None]
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2839
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2840 if warnings is None:
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2841 warnings = []
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2842 warn = True
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2843 else:
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2844 warn = False
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2845
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2846 subs = sorted(wctx.substate)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2847 total = len(subs)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2848 count = 0
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2849 for subpath in subs:
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2850 count += 1
29802 35560189677c subrepo: cleanup of subrepo filematcher logic Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29795 diff changeset	2851 submatch = matchmod.subdirmatcher(subpath, m)
35560189677c subrepo: cleanup of subrepo filematcher logic Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29795 diff changeset	2852 if subrepos or m.exact(subpath) or any(submatch.files()):
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2853 ui.progress(_('searching'), count, total=total, unit=_('subrepos'))
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2854 sub = wctx.sub(subpath)
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2855 try:
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2856 if sub.removefiles(submatch, prefix, after, force, subrepos,
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2857 warnings):
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2858 ret = 1
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2859 except error.LookupError:
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2860 warnings.append(_("skipping missing subrepository: %s\n")
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2861 % join(subpath))
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2862 ui.progress(_('searching'), None)
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2863
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2864 # 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	2865 deleteddirs = util.dirs(deleted)
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2866 files = m.files()
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2867 total = len(files)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2868 count = 0
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2869 for f in files:
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2870 def insubrepo():
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2871 for subpath in wctx.substate:
29622 9c2cc107547f cmdutil: warnings not issued in remove if subrepopath overlaps Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29498 diff changeset	2872 if f.startswith(subpath + '/'):
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2873 return True
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2874 return False
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2875
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2876 count += 1
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2877 ui.progress(_('deleting'), count, total=total, unit=_('files'))
24955 1df233bcb7f6 remove: use ctx.hasdir(f) instead of 'f in ctx.dirs()' Martin von Zweigbergk <martinvonz@google.com> parents: 24947 diff changeset	2878 isdir = f in deleteddirs or wctx.hasdir(f)
29622 9c2cc107547f cmdutil: warnings not issued in remove if subrepopath overlaps Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29498 diff changeset	2879 if (f in repo.dirstate or isdir or f == '.'
9c2cc107547f cmdutil: warnings not issued in remove if subrepopath overlaps Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29498 diff changeset	2880 or insubrepo() or f in subs):
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2881 continue
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23289 diff changeset	2882
23674 6e36b9fc7869 remove: use vfs instead of os.path + match.rel() for filesystem checks Matt Harbison <matt_harbison@yahoo.com> parents: 23673 diff changeset	2883 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	2884 if repo.wvfs.isdir(f):
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2885 warnings.append(_('not removing %s: no tracked files\n')
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2886 % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2887 else:
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2888 warnings.append(_('not removing %s: file is untracked\n')
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2889 % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2890 # 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	2891 ret = 1
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2892 ui.progress(_('deleting'), None)
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2893
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2894 if force:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2895 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	2896 elif after:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2897 list = deleted
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2898 remaining = modified + added + clean
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2899 total = len(remaining)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2900 count = 0
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2901 for f in remaining:
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2902 count += 1
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2903 ui.progress(_('skipping'), count, total=total, unit=_('files'))
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2904 warnings.append(_('not removing %s: file still exists\n')
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2905 % m.rel(f))
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2906 ret = 1
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2907 ui.progress(_('skipping'), None)
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2908 else:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2909 list = deleted + clean
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2910 total = len(modified) + len(added)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2911 count = 0
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2912 for f in modified:
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2913 count += 1
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2914 ui.progress(_('skipping'), count, total=total, unit=_('files'))
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2915 warnings.append(_('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	2916 ' 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	2917 ret = 1
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2918 for f in added:
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2919 count += 1
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2920 ui.progress(_('skipping'), count, total=total, unit=_('files'))
29963 e824de573112 remove: specify hg in added warning timeless <timeless@mozdev.org> parents: 29956 diff changeset	2921 warnings.append(_("not removing %s: file has been marked for add"
e824de573112 remove: specify hg in added warning timeless <timeless@mozdev.org> parents: 29956 diff changeset	2922 " (use 'hg forget' to undo add)\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	2923 ret = 1
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2924 ui.progress(_('skipping'), None)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2925
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2926 list = sorted(list)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2927 total = len(list)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2928 count = 0
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2929 for f in list:
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2930 count += 1
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2931 if ui.verbose or not m.exact(f):
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2932 ui.progress(_('deleting'), count, total=total, unit=_('files'))
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23674 diff changeset	2933 ui.status(_('removing %s\n') % m.rel(f))
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28607 diff changeset	2934 ui.progress(_('deleting'), None)
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2935
27802 ed44a66fd7ae with: use context manager for wlock in remove Bryan O'Sullivan <bryano@fb.com> parents: 27801 diff changeset	2936 with repo.wlock():
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2937 if not after:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2938 for f in list:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2939 if f in added:
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2940 continue # we never unlink added files on remove
31309 8908f985570c vfs: use repo.wvfs.unlinkpath Mads Kiilerich <madski@unity3d.com> parents: 31237 diff changeset	2941 repo.wvfs.unlinkpath(f, ignoremissing=True)
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2942 repo[None].forget(list)
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2943
28607 a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2944 if warn:
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2945 for warning in warnings:
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2946 ui.warn(warning)
a88959ae5938 remove: queue warnings until after status messages (issue5140) (API) timeless <timeless@mozdev.org> parents: 28601 diff changeset	2947
23289 ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2948 return ret
ae5d0a22ee7e remove: move most of the implementation into cmdutils.remove() Matt Harbison <matt_harbison@yahoo.com> parents: 23258 diff changeset	2949
32584 746e12a767b3 cat: add formatter support Yuya Nishihara <yuya@tcha.org> parents: 32583 diff changeset	2950 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2951 err = 1
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2952
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2953 def write(path):
32584 746e12a767b3 cat: add formatter support Yuya Nishihara <yuya@tcha.org> parents: 32583 diff changeset	2954 filename = None
32582 7f4435078a8f cat: stop using makefileobj() Yuya Nishihara <yuya@tcha.org> parents: 32540 diff changeset	2955 if fntemplate:
7f4435078a8f cat: stop using makefileobj() Yuya Nishihara <yuya@tcha.org> parents: 32540 diff changeset	2956 filename = makefilename(repo, fntemplate, ctx.node(),
7f4435078a8f cat: stop using makefileobj() Yuya Nishihara <yuya@tcha.org> parents: 32540 diff changeset	2957 pathname=os.path.join(prefix, path))
32584 746e12a767b3 cat: add formatter support Yuya Nishihara <yuya@tcha.org> parents: 32583 diff changeset	2958 with formatter.maybereopen(basefm, filename, opts) as fm:
32583 7bfa1b199972 cat: use with statement to close output file Yuya Nishihara <yuya@tcha.org> parents: 32582 diff changeset	2959 data = ctx[path].data()
7bfa1b199972 cat: use with statement to close output file Yuya Nishihara <yuya@tcha.org> parents: 32582 diff changeset	2960 if opts.get('decode'):
7bfa1b199972 cat: use with statement to close output file Yuya Nishihara <yuya@tcha.org> parents: 32582 diff changeset	2961 data = repo.wwritedata(path, data)
32584 746e12a767b3 cat: add formatter support Yuya Nishihara <yuya@tcha.org> parents: 32583 diff changeset	2962 fm.startitem()
746e12a767b3 cat: add formatter support Yuya Nishihara <yuya@tcha.org> parents: 32583 diff changeset	2963 fm.write('data', '%s', data)
746e12a767b3 cat: add formatter support Yuya Nishihara <yuya@tcha.org> parents: 32583 diff changeset	2964 fm.data(abspath=path, path=matcher.rel(path))
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2965
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2966 # 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	2967 # 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	2968 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	2969 file = matcher.files()[0]
30340 608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30332 diff changeset	2970 mfl = repo.manifestlog
24718 a4191e0c728f cat: use ctx.manifestnode() in place of ctx._changeset[0] Yuya Nishihara <yuya@tcha.org> parents: 24711 diff changeset	2971 mfnode = ctx.manifestnode()
30340 608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30332 diff changeset	2972 try:
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30332 diff changeset	2973 if mfnode and mfl[mfnode].find(file)[0]:
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30332 diff changeset	2974 write(file)
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30332 diff changeset	2975 return 0
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30332 diff changeset	2976 except KeyError:
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30332 diff changeset	2977 pass
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2978
29739 84a8de5ac901 cmdutil: remove duplicated badmatch call in cat() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29707 diff changeset	2979 for abs in ctx.walk(matcher):
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2980 write(abs)
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2981 err = 0
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2982
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2983 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	2984 sub = ctx.sub(subpath)
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2985 try:
28017 d3f1b7ee5e70 match: rename "narrowmatcher" to "subdirmatcher" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 27985 diff changeset	2986 submatch = matchmod.subdirmatcher(subpath, matcher)
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2987
32584 746e12a767b3 cat: add formatter support Yuya Nishihara <yuya@tcha.org> parents: 32583 diff changeset	2988 if not sub.cat(submatch, basefm, fntemplate,
32540 f4cd4c49e302 cat: pass filename template as explicit argument Yuya Nishihara <yuya@tcha.org> parents: 32539 diff changeset	2989 os.path.join(prefix, sub._path), **opts):
21041 a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2990 err = 0
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2991 except error.RepoLookupError:
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2992 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	2993 % os.path.join(prefix, subpath))
a2cc3c08c3ac cat: support cat with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 21040 diff changeset	2994
21040 bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2995 return err
bdf5ed5246d2 cat: move most of the implementation into cmdutils.cat() Matt Harbison <matt_harbison@yahoo.com> parents: 21036 diff changeset	2996
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	2997 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	2998 '''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	2999 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	3000 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	3001 opts['date'] = util.parsedate(date)
14635 217b7d83afc3 cmdutil, logmessage: use ui.fin when reading from '-' Idan Kamara <idankk86@gmail.com> parents: 14518 diff changeset	3002 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	3003 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	3004
33617 5ac845ca059a commit: don't let failed commit with --addremove update dirstate (issue5645) Martin von Zweigbergk <martinvonz@google.com> parents: 33548 diff changeset	3005 dsguard = None
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	3006 # 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	3007 # that doesn't support addremove
33823 5d286eb7009f commit: move dirstateguard creation out of try-block Martin von Zweigbergk <martinvonz@google.com> parents: 33783 diff changeset	3008 if opts.get('addremove'):
5d286eb7009f commit: move dirstateguard creation out of try-block Martin von Zweigbergk <martinvonz@google.com> parents: 33783 diff changeset	3009 dsguard = dirstateguard.dirstateguard(repo, 'commit')
33824 158dddc635ff commit: use context manager with dirstateguard Martin von Zweigbergk <martinvonz@google.com> parents: 33823 diff changeset	3010 with dsguard or util.nullcontextmanager():
33823 5d286eb7009f commit: move dirstateguard creation out of try-block Martin von Zweigbergk <martinvonz@google.com> parents: 33783 diff changeset	3011 if dsguard:
33617 5ac845ca059a commit: don't let failed commit with --addremove update dirstate (issue5645) Martin von Zweigbergk <martinvonz@google.com> parents: 33548 diff changeset	3012 if scmutil.addremove(repo, matcher, "", opts) != 0:
5ac845ca059a commit: don't let failed commit with --addremove update dirstate (issue5645) Martin von Zweigbergk <martinvonz@google.com> parents: 33548 diff changeset	3013 raise error.Abort(
5ac845ca059a commit: don't let failed commit with --addremove update dirstate (issue5645) Martin von Zweigbergk <martinvonz@google.com> parents: 33548 diff changeset	3014 _("failed to mark all new/missing files as added/removed"))
5ac845ca059a commit: don't let failed commit with --addremove update dirstate (issue5645) Martin von Zweigbergk <martinvonz@google.com> parents: 33548 diff changeset	3015
33824 158dddc635ff commit: use context manager with dirstateguard Martin von Zweigbergk <martinvonz@google.com> parents: 33823 diff changeset	3016 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	3017
29819 2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3018 def samefile(f, ctx1, ctx2):
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3019 if f in ctx1.manifest():
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3020 a = ctx1.filectx(f)
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3021 if f in ctx2.manifest():
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3022 b = ctx2.filectx(f)
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3023 return (not a.cmp(b)
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3024 and a.flags() == b.flags())
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3025 else:
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3026 return False
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3027 else:
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3028 return f not in ctx2.manifest()
2cec6eaf3610 cmdutil: extract samefile function from amend() Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29802 diff changeset	3029
34086 a39dce4a76b8 cmdutil: remove redundant commitfunc parameter in amend (API) Saurabh Singh <singhsrb@fb.com> parents: 34085 diff changeset	3030 def amend(ui, repo, old, extra, pats, opts):
25930 221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	3031 # avoid cycle context -> subrepo -> cmdutil
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	3032 from . import context
25930 221491bbaf7e cmdutil: break import cycle Gregory Szorc <gregory.szorc@gmail.com> parents: 25795 diff changeset	3033
23101 b564330d4b1f amend: abort early if no username is configured with evolve enabled (issue4211) Matt Harbison <matt_harbison@yahoo.com> parents: 22951 diff changeset	3034 # 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	3035 # 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	3036 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	3037 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	3038
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	3039 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	3040 base = old.p1()
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	3041
33509 a3acacbd0ff3 bookmark: remove a useless 'recordchange' in the amend code Boris Feld <boris.feld@octobus.net> parents: 33499 diff changeset	3042 with repo.wlock(), repo.lock(), repo.transaction('amend'):
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3043 # Participating changesets:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3044 #
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3045 # wctx o - workingctx that contains changes from working copy
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3046 # \| to go into amending commit
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3047 # \|
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3048 # old o - changeset to amend
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3049 # \|
34056 7e9ccb1670e3 amend: rectify comment Saurabh Singh <singhsrb@fb.com> parents: 34055 diff changeset	3050 # base o - first parent of the changeset to amend
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3051 wctx = repo[None]
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3052
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3053 # Update extra dict from amended commit (e.g. to preserve graft
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3054 # source)
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3055 extra.update(old.extra())
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3056
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3057 # Also update it from the from the wctx
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3058 extra.update(wctx.extra())
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3059
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3060 user = opts.get('user') or old.user()
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3061 date = opts.get('date') or old.date()
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3062
34121 ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34086 diff changeset	3063 # Parse the date to allow comparison between date and old.date()
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34086 diff changeset	3064 date = util.parsedate(date)
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34086 diff changeset	3065
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3066 if len(old.parents()) > 1:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3067 # ctx.files() isn't reliable for merges, so fall back to the
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3068 # slower repo.status() method
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3069 files = set([fn for st in repo.status(base, old)[:3]
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3070 for fn in st])
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3071 else:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3072 files = set(old.files())
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3073
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3074 # add/remove the files to the working copy if the "addremove" option
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3075 # was specified.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3076 matcher = scmutil.match(wctx, pats, opts)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3077 if (opts.get('addremove')
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3078 and scmutil.addremove(repo, matcher, "", opts)):
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3079 raise error.Abort(
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3080 _("failed to mark all new/missing files as added/removed"))
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3081
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3082 filestoamend = set(f for f in wctx.files() if matcher(f))
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3083
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3084 changes = (len(filestoamend) > 0)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3085 if changes:
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3086 # Recompute copies (avoid recording a -> b -> a)
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3087 copied = copies.pathcopies(base, wctx, matcher)
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3088 if old.p2:
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3089 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3090
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3091 # Prune files which were reverted by the updates: if old
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3092 # introduced file X and the file was renamed in the working
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3093 # copy, then those two files are the same and
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3094 # we can discard X from our list of files. Likewise if X
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3095 # was deleted, it's no longer relevant
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3096 files.update(filestoamend)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3097 files = [f for f in files if not samefile(f, wctx, base)]
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3098
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3099 def filectxfn(repo, ctx_, path):
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3100 try:
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3101 # If the file being considered is not amongst the files
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3102 # to be amended, we should return the file context from the
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3103 # old changeset. This avoids issues when only some files in
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3104 # the working copy are being amended but there are also
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3105 # changes to other files from the old changeset.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3106 if path not in filestoamend:
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3107 return old.filectx(path)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3108
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3109 fctx = wctx[path]
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3110
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3111 # Return None for removed files.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3112 if not fctx.exists():
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3113 return None
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3114
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3115 flags = fctx.flags()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3116 mctx = context.memfilectx(repo,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3117 fctx.path(), fctx.data(),
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3118 islink='l' in flags,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3119 isexec='x' in flags,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3120 copied=copied.get(path))
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3121 return mctx
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3122 except KeyError:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3123 return None
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3124 else:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3125 ui.note(_('copying changeset %s to %s\n') % (old, base))
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3126
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3127 # Use version of files as in the old cset
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3128 def filectxfn(repo, ctx_, path):
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3129 try:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3130 return old.filectx(path)
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3131 except KeyError:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3132 return None
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3133
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3134 # See if we got a message from -m or -l, if not, open the editor with
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3135 # the message of the changeset to amend.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3136 message = logmessage(ui, opts)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3137
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3138 editform = mergeeditform(old, 'commit.amend')
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3139 editor = getcommiteditor(editform=editform,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3140 **pycompat.strkwargs(opts))
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3141
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3142 if not message:
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3143 editor = getcommiteditor(edit=True, editform=editform)
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3144 message = old.description()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3145
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3146 pureextra = extra.copy()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3147 extra['amend_source'] = old.hex()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3148
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3149 new = context.memctx(repo,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3150 parents=[base.node(), old.p2().node()],
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3151 text=message,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3152 files=files,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3153 filectxfn=filectxfn,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3154 user=user,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3155 date=date,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3156 extra=extra,
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3157 editor=editor)
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3158
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3159 newdesc = changelog.stripdesc(new.description())
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3160 if ((not changes)
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3161 and newdesc == old.description()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3162 and user == old.user()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3163 and date == old.date()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3164 and pureextra == old.extra()):
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3165 # nothing changed. continuing here would create a new node
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3166 # anyway because of the amend_source noise.
17472 965fbe04fd96 amend: wrap all commit operations in a single transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17471 diff changeset	3167 #
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3168 # This not what we expect from amend.
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3169 return old.node()
8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3170
34081 5dc6ac6555e6 amend: use context manager for config override Martin von Zweigbergk <martinvonz@google.com> parents: 34080 diff changeset	3171 if opts.get('secret'):
5dc6ac6555e6 amend: use context manager for config override Martin von Zweigbergk <martinvonz@google.com> parents: 34080 diff changeset	3172 commitphase = 'secret'
5dc6ac6555e6 amend: use context manager for config override Martin von Zweigbergk <martinvonz@google.com> parents: 34080 diff changeset	3173 else:
5dc6ac6555e6 amend: use context manager for config override Martin von Zweigbergk <martinvonz@google.com> parents: 34080 diff changeset	3174 commitphase = old.phase()
5dc6ac6555e6 amend: use context manager for config override Martin von Zweigbergk <martinvonz@google.com> parents: 34080 diff changeset	3175 overrides = {('phases', 'new-commit'): commitphase}
5dc6ac6555e6 amend: use context manager for config override Martin von Zweigbergk <martinvonz@google.com> parents: 34080 diff changeset	3176 with ui.configoverride(overrides, 'amend'):
33438 8056481caa81 codemod: simplify nested withs Jun Wu <quark@fb.com> parents: 33362 diff changeset	3177 newid = repo.commitctx(new)
34055 ae92e5c0441c amend: removing redundant if condition Saurabh Singh <singhsrb@fb.com> parents: 34029 diff changeset	3178
ae92e5c0441c amend: removing redundant if condition Saurabh Singh <singhsrb@fb.com> parents: 34029 diff changeset	3179 # Reroute the working copy parent to the new changeset
ae92e5c0441c amend: removing redundant if condition Saurabh Singh <singhsrb@fb.com> parents: 34029 diff changeset	3180 repo.setparents(newid, nullid)
ae92e5c0441c amend: removing redundant if condition Saurabh Singh <singhsrb@fb.com> parents: 34029 diff changeset	3181 mapping = {old.node(): (newid,)}
ae92e5c0441c amend: removing redundant if condition Saurabh Singh <singhsrb@fb.com> parents: 34029 diff changeset	3182 scmutil.cleanupnodes(repo, mapping, 'amend')
ae92e5c0441c amend: removing redundant if condition Saurabh Singh <singhsrb@fb.com> parents: 34029 diff changeset	3183
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3184 # Fixing the dirstate because localrepo.commitctx does not update
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3185 # it. This is rather convenient because we did not need to update
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3186 # the dirstate for all the files in the new commit which commitctx
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3187 # could have done if it updated the dirstate. Now, we can
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3188 # selectively update the dirstate only for the amended files.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3189 dirstate = repo.dirstate
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3190
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3191 # Update the state of the files which were added and
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3192 # and modified in the amend to "normal" in the dirstate.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3193 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3194 for f in normalfiles:
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3195 dirstate.normal(f)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3196
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3197 # Update the state of files which were removed in the amend
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3198 # to "removed" in the dirstate.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3199 removedfiles = set(wctx.removed()) & filestoamend
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3200 for f in removedfiles:
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3201 dirstate.drop(f)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34083 diff changeset	3202
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	3203 return newid
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: 16430 diff changeset	3204
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	3205 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	3206 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	3207 return ctx.description()
26742 bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3208 return commitforceeditor(repo, ctx, subs, editform=editform,
bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3209 unchangedmessagedetection=True)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	3210
21999 6ce282ed801e cmdutil: introduce 'editform' to distinguish the purpose of commit text editing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21998 diff changeset	3211 def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None,
26742 bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3212 editform='', unchangedmessagedetection=False):
21923 e582e20cd3e6 commiteditor: refactor default extramsg Matt Mackall <mpm@selenic.com> parents: 21878 diff changeset	3213 if not extramsg:
e582e20cd3e6 commiteditor: refactor default extramsg Matt Mackall <mpm@selenic.com> parents: 21878 diff changeset	3214 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	3215
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	3216 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	3217 forms.insert(0, 'changeset')
26742 bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3218 templatetext = None
22012 9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	3219 while forms:
32878 a3a36bcf122e commit: select template by spec.ref name Yuya Nishihara <yuya@tcha.org> parents: 32877 diff changeset	3220 ref = '.'.join(forms)
a3a36bcf122e commit: select template by spec.ref name Yuya Nishihara <yuya@tcha.org> parents: 32877 diff changeset	3221 if repo.ui.config('committemplate', ref):
26742 bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3222 templatetext = committext = buildcommittemplate(
32878 a3a36bcf122e commit: select template by spec.ref name Yuya Nishihara <yuya@tcha.org> parents: 32877 diff changeset	3223 repo, ctx, subs, extramsg, ref)
22012 9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	3224 break
9d92b9d1e282 cmdutil: look commit template definition up by specified 'editform' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22011 diff changeset	3225 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	3226 else:
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	3227 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	3228
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3229 # run editor in the repository root
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30506 diff changeset	3230 olddir = pycompat.getcwd()
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3231 os.chdir(repo.root)
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26746 diff changeset	3232
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26746 diff changeset	3233 # make in-memory changes visible to external process
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26746 diff changeset	3234 tr = repo.currenttransaction()
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26746 diff changeset	3235 repo.dirstate.write(tr)
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26746 diff changeset	3236 pending = tr and tr.writepending() and repo.root
9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26746 diff changeset	3237
26742 bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3238 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
30836 565c07036066 cmdutil: add tmpdir parament to ui.edit calls Sean Farley <sean@farley.io> parents: 30833 diff changeset	3239 editform=editform, pending=pending,
34029 6e6452bc441d editor: use an unambiguous path suffix for editor files Michael Bolin <mbolin@fb.com> parents: 34022 diff changeset	3240 repopath=repo.path, action='commit')
30724 ee47e951c6f9 commit: fix unmodified message detection for the "--- >8 ----" magic Yuya Nishihara <yuya@tcha.org> parents: 30720 diff changeset	3241 text = editortext
30703 5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	3242
5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	3243 # strip away anything below this special string (used for editors that want
5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	3244 # to display the diff)
30724 ee47e951c6f9 commit: fix unmodified message detection for the "--- >8 ----" magic Yuya Nishihara <yuya@tcha.org> parents: 30720 diff changeset	3245 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
30703 5c85c93cdd61 cmdutil: add special string that ignores rest of text Sean Farley <sean@farley.io> parents: 30695 diff changeset	3246 if stripbelow:
30724 ee47e951c6f9 commit: fix unmodified message detection for the "--- >8 ----" magic Yuya Nishihara <yuya@tcha.org> parents: 30720 diff changeset	3247 text = text[:stripbelow.start()]
ee47e951c6f9 commit: fix unmodified message detection for the "--- >8 ----" magic Yuya Nishihara <yuya@tcha.org> parents: 30720 diff changeset	3248
ee47e951c6f9 commit: fix unmodified message detection for the "--- >8 ----" magic Yuya Nishihara <yuya@tcha.org> parents: 30720 diff changeset	3249 text = re.sub("(?m)^HG:.*(\n\|$)", "", text)
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3250 os.chdir(olddir)
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3251
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3252 if finishdesc:
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3253 text = finishdesc(text)
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3254 if not text.strip():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	3255 raise error.Abort(_("empty commit message"))
26742 bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3256 if unchangedmessagedetection and editortext == templatetext:
bec1a579ebc4 commit: abort when a committemplate is not changed Tony Tung <tonytung@fb.com> parents: 26639 diff changeset	3257 raise error.Abort(_("commit message unchanged"))
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3258
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3259 return text
e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3260
32878 a3a36bcf122e commit: select template by spec.ref name Yuya Nishihara <yuya@tcha.org> parents: 32877 diff changeset	3261 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	3262 ui = repo.ui
32878 a3a36bcf122e commit: select template by spec.ref name Yuya Nishihara <yuya@tcha.org> parents: 32877 diff changeset	3263 spec = formatter.templatespec(ref, None, None)
32839 b425ec7fb7f6 cmdutil: pass templatespec tuple directly to changeset_templater (API) Yuya Nishihara <yuya@tcha.org> parents: 32838 diff changeset	3264 t = changeset_templater(ui, repo, spec, None, {}, False)
32878 a3a36bcf122e commit: select template by spec.ref name Yuya Nishihara <yuya@tcha.org> parents: 32877 diff changeset	3265 t.t.cache.update((k, templater.unquotestring(v))
a3a36bcf122e commit: select template by spec.ref name Yuya Nishihara <yuya@tcha.org> parents: 32877 diff changeset	3266 for k, v in repo.ui.configitems('committemplate'))
22013 de5cee8ba088 cmdutil: use '[committemplate]' section like as map file for style definition FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22012 diff changeset	3267
21924 5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	3268 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	3269 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	3270
5375ba75df40 cmdutil: make commit message shown in text editor customizable by template FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21923 diff changeset	3271 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	3272 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	3273 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	3274
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3275 def hgprefix(msg):
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3276 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	3277
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3278 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	3279 edittext = []
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	3280 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	3281 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	3282 edittext.append(ctx.description())
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	3283 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	3284 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	3285 edittext.append(hgprefix(_("Enter commit message."
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3286 " Lines beginning with 'HG:' are removed.")))
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3287 edittext.append(hgprefix(extramsg))
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	3288 edittext.append("HG: --")
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3289 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	3290 if ctx.p2():
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3291 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	3292 if ctx.branch():
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3293 edittext.append(hgprefix(_("branch '%s'") % ctx.branch()))
24986 fb9b7b937b3e bookmarks: simplify iscurrent to isactivewdirparent (API) Ryan McElroy <rmcelroy@fb.com> parents: 24955 diff changeset	3294 if bookmarks.isactivewdirparent(repo):
26426 0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3295 edittext.append(hgprefix(_("bookmark '%s'") % repo._activebookmark))
0486c16ce621 cmdutil: handle multiline translations of HG: messages safely timeless@mozdev.org parents: 26389 diff changeset	3296 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	3297 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	3298 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	3299 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	3300 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	3301 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	3302 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	3303
21869 e353fac7db26 cmdutil: separate building commit text from 'commitforceeditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21832 diff changeset	3304 return "\n".join(edittext)
14297 2daa5179e73f commands: use a decorator to build table incrementally Adrian Buehlmann <adrian@cadifra.com> parents: 14291 diff changeset	3305
26324 4a8e21578e14 addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26229 diff changeset	3306 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	3307 if opts is None:
4a8e21578e14 addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26229 diff changeset	3308 opts = {}
18688 79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3309 ctx = repo[node]
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3310 parents = ctx.parents()
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3311
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3312 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	3313 [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	3314 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	3315 # 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	3316 # 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	3317 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3318 # 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	3319 # N: null or no parent
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3320 # 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	3321 # 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	3322 # 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	3323 # 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	3324 # 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	3325 # 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	3326 # printed anyway.
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3327 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3328 # Par Msg Comment
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3329 # 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	3330 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3331 # 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	3332 # 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	3333 # H N n usual case
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3334 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3335 # 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	3336 # C B y branch merge
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3337 # 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	3338 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3339 # 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	3340 # 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	3341 #
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3342 # 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	3343
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3344 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	3345 for r in parents:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3346 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	3347 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	3348
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3349 if repo.ui.debugflag:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3350 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	3351 elif repo.ui.verbose:
79107fad06aa commit: factor out status printing into a helper function Kevin Bullock <kbullock@ringworld.org> parents: 18648 diff changeset	3352 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	3353
27943 02c5f8ad00ac commit: factor the post commit status check into a cmdutil method Matt Harbison <matt_harbison@yahoo.com> parents: 27868 diff changeset	3354 def postcommitstatus(repo, pats, opts):
02c5f8ad00ac commit: factor the post commit status check into a cmdutil method Matt Harbison <matt_harbison@yahoo.com> parents: 27868 diff changeset	3355 return repo.status(match=scmutil.match(repo[None], pats, opts))
02c5f8ad00ac commit: factor the post commit status check into a cmdutil method Matt Harbison <matt_harbison@yahoo.com> parents: 27868 diff changeset	3356
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3357 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	3358 parent, p2 = parents
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3359 node = ctx.node()
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3360
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3361 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	3362 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	3363 parent = p2
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3364
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3365 # 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	3366 # 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	3367 # 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	3368 # 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	3369 # 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	3370
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3371 # `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	3372 # The mapping is in the form:
8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3373 # <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	3374 names = {}
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3375
27803 a8e8950ebd4d with: use context manager for wlock in revert Bryan O'Sullivan <bryano@fb.com> parents: 27802 diff changeset	3376 with repo.wlock():
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3377 ## filling of the `names` mapping
8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3378 # 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	3379
24475 06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3380 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	3381 wctx = repo[None]
bab983bb6fd1 revert: define 'wctx' a little earlier and use it more Martin von Zweigbergk <martinvonz@google.com> parents: 24438 diff changeset	3382 m = scmutil.match(wctx, pats, opts)
24479 871485bd03fd revert: move calculation of targetsubs earlier Matt Mackall <mpm@selenic.com> parents: 24476 diff changeset	3383
871485bd03fd revert: move calculation of targetsubs earlier Matt Mackall <mpm@selenic.com> parents: 24476 diff changeset	3384 # we'll need this later
871485bd03fd revert: move calculation of targetsubs earlier Matt Mackall <mpm@selenic.com> parents: 24476 diff changeset	3385 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	3386
24450 961790c35b4f revert: take fast path also when not reverting to '.' Martin von Zweigbergk <martinvonz@google.com> parents: 24449 diff changeset	3387 if not m.always():
32362 7b3c27af90c2 cmdutil: use repo[None].walk instead of repo.walk Augie Fackler <augie@google.com> parents: 32343 diff changeset	3388 matcher = matchmod.badmatch(m, lambda x, y: False)
32382 c87db79b9507 cleanup: reuse existing wctx variables instead of calling repo[None] Martin von Zweigbergk <martinvonz@google.com> parents: 32375 diff changeset	3389 for abs in wctx.walk(matcher):
22573 f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3390 names[abs] = m.rel(abs), m.exact(abs)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3391
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3392 # walk target manifest to fill `names`
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3393
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3394 def badfn(path, msg):
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3395 if path in names:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3396 return
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3397 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	3398 return
22573 f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3399 path_ = path + '/'
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3400 for f in names:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3401 if f.startswith(path_):
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3402 return
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3403 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	3404
25439 aaede04c0ba6 revert: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25438 diff changeset	3405 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	3406 if abs not in names:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3407 names[abs] = m.rel(abs), m.exact(abs)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3408
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3409 # Find status of all file in `names`.
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3410 m = scmutil.matchfiles(repo, names)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3411
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3412 changes = repo.status(node1=node, match=m,
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3413 unknown=True, ignored=True, clean=True)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3414 else:
24450 961790c35b4f revert: take fast path also when not reverting to '.' Martin von Zweigbergk <martinvonz@google.com> parents: 24449 diff changeset	3415 changes = repo.status(node1=node, match=m)
22573 f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3416 for kind in changes:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3417 for abs in kind:
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3418 names[abs] = m.rel(abs), m.exact(abs)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3419
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3420 m = scmutil.matchfiles(repo, names)
f528bfb25b45 revert: special case 'hg revert --all' Durham Goode <durham@fb.com> parents: 22551 diff changeset	3421
23374 aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3422 modified = set(changes.modified)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3423 added = set(changes.added)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3424 removed = set(changes.removed)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3425 _deleted = set(changes.deleted)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3426 unknown = set(changes.unknown)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3427 unknown.update(changes.ignored)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3428 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	3429 modadded = set()
22185 afead12e724b revert: triage "deleted" files into more appropriate categories Pierre-Yves David <pierre-yves.david@fb.com> parents: 22173 diff changeset	3430
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24176 diff changeset	3431 # 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	3432 # 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	3433 # 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	3434 # 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	3435 if parent == node:
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	3436 dsmodified = modified
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	3437 dsadded = added
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	3438 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	3439 # 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	3440 localchanges = dsmodified \| dsadded
22155 530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	3441 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	3442 else:
530390629842 revert: call status against revert target too Pierre-Yves David <pierre-yves.david@fb.com> parents: 22154 diff changeset	3443 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	3444 dsmodified = set(changes.modified)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3445 dsadded = set(changes.added)
aa0a430d9c75 revert: access status fields by name rather than index Martin von Zweigbergk <martinvonz@google.com> parents: 23327 diff changeset	3446 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	3447 # 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	3448 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	3449
22188 0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	3450 # 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	3451 clean \|= dsremoved - removed
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	3452 dsremoved &= removed
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	3453 # 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	3454 removed -= dsremoved
0ad619c5e1a4 revert: use "remove" information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22187 diff changeset	3455
22610 0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	3456 modadded = added & dsmodified
0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	3457 added -= modadded
0f323ed8effd revert: track added files with local modifications Pierre-Yves David <pierre-yves.david@fb.com> parents: 22609 diff changeset	3458
22190 55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	3459 # tell newly modified apart.
55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	3460 dsmodified &= modified
29103 f2aa1c3e7e77 cmdutil: typo fix in comment Augie Fackler <augie@google.com> parents: 28999 diff changeset	3461 dsmodified \|= modified & dsadded # dirstate added may need backup
22190 55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	3462 modified -= dsmodified
55308ab8117c revert: use modified information from both statuses Pierre-Yves David <pierre-yves.david@fb.com> parents: 22189 diff changeset	3463
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	3464 # 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	3465 # 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	3466 # that purpose.
22208 d3659b3795e9 revert: simplify handling of `added` files Pierre-Yves David <pierre-yves.david@fb.com> parents: 22205 diff changeset	3467 dsadded = added
d3659b3795e9 revert: simplify handling of `added` files Pierre-Yves David <pierre-yves.david@fb.com> parents: 22205 diff changeset	3468
22209 06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	3469 # 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	3470 # 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	3471 if p2 != nullid:
31134 c22253c4c1b8 revert: remove set(mf) because it's O(manifest) Durham Goode <durham@fb.com> parents: 31078 diff changeset	3472 mergeadd = set(dsmodified)
c22253c4c1b8 revert: remove set(mf) because it's O(manifest) Durham Goode <durham@fb.com> parents: 31078 diff changeset	3473 for path in dsmodified:
c22253c4c1b8 revert: remove set(mf) because it's O(manifest) Durham Goode <durham@fb.com> parents: 31078 diff changeset	3474 if path in mf:
c22253c4c1b8 revert: remove set(mf) because it's O(manifest) Durham Goode <durham@fb.com> parents: 31078 diff changeset	3475 mergeadd.remove(path)
22209 06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	3476 dsadded \|= mergeadd
06fbd9518bc5 revert: detect files added during a merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 22208 diff changeset	3477 dsmodified -= mergeadd
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3478
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3479 # 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	3480 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	3481 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	3482 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	3483 # 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	3484 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	3485 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	3486 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	3487
31157 accdd5e62066 revert: move code dealing with deletions closer together Martin von Zweigbergk <martinvonz@google.com> parents: 31134 diff changeset	3488 # determine the exact nature of the deleted changesets
accdd5e62066 revert: move code dealing with deletions closer together Martin von Zweigbergk <martinvonz@google.com> parents: 31134 diff changeset	3489 deladded = set(_deleted)
accdd5e62066 revert: move code dealing with deletions closer together Martin von Zweigbergk <martinvonz@google.com> parents: 31134 diff changeset	3490 for path in _deleted:
accdd5e62066 revert: move code dealing with deletions closer together Martin von Zweigbergk <martinvonz@google.com> parents: 31134 diff changeset	3491 if path in mf:
accdd5e62066 revert: move code dealing with deletions closer together Martin von Zweigbergk <martinvonz@google.com> parents: 31134 diff changeset	3492 deladded.remove(path)
accdd5e62066 revert: move code dealing with deletions closer together Martin von Zweigbergk <martinvonz@google.com> parents: 31134 diff changeset	3493 deleted = _deleted - deladded
accdd5e62066 revert: move code dealing with deletions closer together Martin von Zweigbergk <martinvonz@google.com> parents: 31134 diff changeset	3494
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	3495 # 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	3496 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	3497 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	3498 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	3499 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	3500 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	3501
22490 bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	3502 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	3503 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	3504 dsadded.add(abs)
bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	3505 deladded -= dsadded
bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	3506
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	3507 # 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	3508 # 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	3509 # 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	3510 # 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	3511 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	3512 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	3513 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	3514 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	3515 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	3516 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	3517
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	3518 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	3519 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	3520 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	3521 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	3522 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	3523 dsremoved -= dsremovunk
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3524
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3525 # 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	3526 # (<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	3527 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	3528 '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	3529 'remove': ([], _('removing %s\n')),
22491 5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	3530 '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	3531 '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	3532 '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	3533 '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	3534 '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	3535 }
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3536
22608 bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	3537 # "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	3538 # 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	3539 # 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	3540 # These values are ordered for comparison purposes
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3541 backupinteractive = 3 # do backup if interactively modified
22608 bf0ecb224316 revert: small refactoring in the way backup value are handled Pierre-Yves David <pierre-yves.david@fb.com> parents: 22588 diff changeset	3542 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	3543 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	3544 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	3545 if opts.get('no_backup'):
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3546 backupinteractive = backup = check = discard
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3547 if interactive:
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3548 dsmodifiedbackup = backupinteractive
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3549 else:
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3550 dsmodifiedbackup = backup
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3551 tobackup = set()
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3552
22611 2ff28e07d7d6 revert: properly back up added files with local modification Pierre-Yves David <pierre-yves.david@fb.com> parents: 22610 diff changeset	3553 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	3554 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	3555 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	3556
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3557 disptable = (
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3558 # dispatch table:
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3559 # 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	3560 # action
fc8bc2787528 revert: move manifest membership condition outside of the loop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22013 diff changeset	3561 # make backup
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3562
81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3563 ## 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	3564 # 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	3565 (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	3566 # 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	3567 (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	3568 # Modified compared to target, local change
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3569 (dsmodified, actions['revert'], dsmodifiedbackup),
22371 81ad62defef5 revert: add documentation in the dispatch table Pierre-Yves David <pierre-yves.david@fb.com> parents: 22370 diff changeset	3570 # 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	3571 (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	3572 # 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	3573 (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	3574 # 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	3575 (modadded, backupanddel, backup),
22490 bcab7bc7280e revert: explicitly track added but deleted file Pierre-Yves David <pierre-yves.david@fb.com> parents: 22489 diff changeset	3576 # 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	3577 (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	3578 # 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	3579 (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	3580 # 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	3581 (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	3582 # 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	3583 (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	3584 # 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	3585 (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	3586 ## 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	3587 # 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	3588 (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	3589 # 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	3590 (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	3591 )
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3592
a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3593 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	3594 # 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	3595 target = repo.wjoin(abs)
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3596 # 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	3597 # 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	3598 # 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	3599 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	3600 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	3601 continue
22233 4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3602 if xlist is not None:
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3603 xlist.append(abs)
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3604 if dobackup:
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3605 # If in interactive mode, don't automatically create
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3606 # .orig files (issue4793)
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3607 if dobackup == backupinteractive:
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3608 tobackup.add(abs)
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3609 elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])):
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27637 diff changeset	3610 bakname = scmutil.origpath(ui, repo, rel)
22609 3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3611 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	3612 (rel, bakname))
3760ebf786b8 revert: distinguish between "check" and "backup" strategy Pierre-Yves David <pierre-yves.david@fb.com> parents: 22608 diff changeset	3613 if not opts.get('dry_run'):
24475 06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3614 if interactive:
06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3615 util.copyfile(target, bakname)
06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3616 else:
06cbff4674a3 revert: fix --interactive on local modification (issue4576) Laurent Charignon <lcharignon@fb.com> parents: 24472 diff changeset	3617 util.rename(target, bakname)
22233 4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3618 if ui.verbose or not exact:
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3619 if not isinstance(msg, basestring):
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3620 msg = msg(abs)
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3621 ui.status(msg % rel)
4ab61b24e20c revert: simplify loop conditional Pierre-Yves David <pierre-yves.david@fb.com> parents: 22232 diff changeset	3622 elif exact:
22234 fe9fc29ac2d0 revert: add a message to noop action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22233 diff changeset	3623 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	3624 break
21575 8262c2a39ab8 revert: add some inline comments Pierre-Yves David <pierre-yves.david@fb.com> parents: 21574 diff changeset	3625
16304 a740fa28d718 revert: move bulk of revert command from commands to cmdutil Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16283 diff changeset	3626 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	3627 needdata = ('revert', 'add', 'undelete')
6156edaa82aa revert: move prefetch to after the actions logic Durham Goode <durham@fb.com> parents: 23955 diff changeset	3628 _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3629 _performrevert(repo, parents, ctx, actions, interactive, tobackup)
19129 bd19587a3347 revert: ensure that copies and renames are honored (issue3920) Bryan O'Sullivan <bryano@fb.com> parents: 19024 diff changeset	3630
24134 afed5d2e7985 revert: display full subrepo output with --dry-run Matt Harbison <matt_harbison@yahoo.com> parents: 24064 diff changeset	3631 if targetsubs:
afed5d2e7985 revert: display full subrepo output with --dry-run Matt Harbison <matt_harbison@yahoo.com> parents: 24064 diff changeset	3632 # 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	3633 for sub in targetsubs:
24463 06d199e66bbc revert: handle subrepos missing in the given --rev Matt Harbison <matt_harbison@yahoo.com> parents: 24455 diff changeset	3634 try:
24464 30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24463 diff changeset	3635 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	3636 except KeyError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	3637 raise error.Abort("subrepository '%s' does not exist in %s!"
24463 06d199e66bbc revert: handle subrepos missing in the given --rev Matt Harbison <matt_harbison@yahoo.com> parents: 24455 diff changeset	3638 % (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	3639
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	3640 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	3641 """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	3642 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	3643
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3644 def _performrevert(repo, parents, ctx, actions, interactive=False,
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3645 tobackup=None):
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3646 """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	3647
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3648 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	3649 the imminent revert.
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3650
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20790 diff changeset	3651 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	3652 """
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3653 parent, p2 = parents
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3654 node = ctx.node()
27985 79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3655 excluded_files = []
79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3656 matcher_opts = {"exclude": excluded_files}
79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3657
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3658 def checkout(f):
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3659 fc = ctx[f]
25755 72d395e399c1 cmdutil: remove useless dirstate.normallookup() invocation in revert() FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25739 diff changeset	3660 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	3661
30532 66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3662 def doremove(f):
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3663 try:
31309 8908f985570c vfs: use repo.wvfs.unlinkpath Mads Kiilerich <madski@unity3d.com> parents: 31237 diff changeset	3664 repo.wvfs.unlinkpath(f)
30532 66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3665 except OSError:
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3666 pass
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3667 repo.dirstate.remove(f)
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3668
33649 377e8ddaebef pathauditor: disable cache of audited paths by default (issue5628) Yuya Nishihara <yuya@tcha.org> parents: 33617 diff changeset	3669 audit_path = pathutil.pathauditor(repo.root, cached=True)
22489 0d57bf80c7cb revert: have an explicit action for "forget" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22488 diff changeset	3670 for f in actions['forget'][0]:
27985 79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3671 if interactive:
30530 74013a831872 style: avoid an unnecessary line split Denis Laxalde <denis.laxalde@logilab.fr> parents: 30519 diff changeset	3672 choice = repo.ui.promptchoice(
30531 841092fd6b85 revert: indicate the default choice when prompting to forget files Denis Laxalde <denis.laxalde@logilab.fr> parents: 30530 diff changeset	3673 _("forget added file %s (Yn)?$$ &Yes $$ &No") % f)
27985 79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3674 if choice == 0:
79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3675 repo.dirstate.drop(f)
79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3676 else:
79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3677 excluded_files.append(repo.wjoin(f))
79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3678 else:
79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3679 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	3680 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	3681 audit_path(f)
30532 66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3682 if interactive:
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3683 choice = repo.ui.promptchoice(
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3684 _("remove added file %s (Yn)?$$ &Yes $$ &No") % f)
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3685 if choice == 0:
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3686 doremove(f)
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3687 else:
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3688 excluded_files.append(repo.wjoin(f))
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3689 else:
66b162fa3ffa revert: prompt before removing files in interactive mode Denis Laxalde <denis.laxalde@logilab.fr> parents: 30531 diff changeset	3690 doremove(f)
22491 5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	3691 for f in actions['drop'][0]:
5e16fe6fdd32 revert: add a `drop` action Pierre-Yves David <pierre-yves.david@fb.com> parents: 22490 diff changeset	3692 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	3693 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	3694
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3695 normal = None
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3696 if node == parent:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3697 # 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	3698 # 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	3699 # 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	3700 if p2 != nullid:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3701 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	3702 else:
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3703 normal = repo.dirstate.normal
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3704
25259 5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3705 newlyaddedandmodifiedfiles = set()
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3706 if interactive:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3707 # Prompt the user for changes to revert
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3708 torevert = [repo.wjoin(f) for f in actions['revert'][0]]
27985 79139c7a88bd revert: makes interactive mode ask to forget added files (issue4936) liscju <piotr.listkiewicz@gmail.com> parents: 27973 diff changeset	3709 m = scmutil.match(ctx, torevert, matcher_opts)
25258 f37a69ec3f47 revert: make revert --interactive use git style diff Laurent Charignon <lcharignon@fb.com> parents: 25257 diff changeset	3710 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	3711 diffopts.nodates = True
f37a69ec3f47 revert: make revert --interactive use git style diff Laurent Charignon <lcharignon@fb.com> parents: 25257 diff changeset	3712 diffopts.git = True
31196 3af9a9628ecf revert: always display hunks reversed when reverting to parent Denis Laxalde <denis.laxalde@logilab.fr> parents: 31171 diff changeset	3713 operation = 'discard'
3af9a9628ecf revert: always display hunks reversed when reverting to parent Denis Laxalde <denis.laxalde@logilab.fr> parents: 31171 diff changeset	3714 reversehunks = True
3af9a9628ecf revert: always display hunks reversed when reverting to parent Denis Laxalde <denis.laxalde@logilab.fr> parents: 31171 diff changeset	3715 if node != parent:
3af9a9628ecf revert: always display hunks reversed when reverting to parent Denis Laxalde <denis.laxalde@logilab.fr> parents: 31171 diff changeset	3716 operation = 'revert'
3af9a9628ecf revert: always display hunks reversed when reverting to parent Denis Laxalde <denis.laxalde@logilab.fr> parents: 31171 diff changeset	3717 reversehunks = repo.ui.configbool('experimental',
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33438 diff changeset	3718 'revertalternateinteractivemode')
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3719 if reversehunks:
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3720 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	3721 else:
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3722 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	3723 originalchunks = patch.parsepatch(diff)
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3724
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3725 try:
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3726
29283 14eee72c8d52 revert: use "discard"/"revert" verb when reverting interactively (issue5143) Denis Laxalde <denis.laxalde@logilab.fr> parents: 29216 diff changeset	3727 chunks, opts = recordfilter(repo.ui, originalchunks,
14eee72c8d52 revert: use "discard"/"revert" verb when reverting interactively (issue5143) Denis Laxalde <denis.laxalde@logilab.fr> parents: 29216 diff changeset	3728 operation=operation)
25424 69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3729 if reversehunks:
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3730 chunks = patch.reversehunks(chunks)
69609f43c752 revert: add an experimental config to use inverted selection Laurent Charignon <lcharignon@fb.com> parents: 25358 diff changeset	3731
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25657 diff changeset	3732 except patch.PatchError as err:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	3733 raise error.Abort(_('error parsing patch: %s') % err)
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3734
25259 5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3735 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3736 if tobackup is None:
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3737 tobackup = set()
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3738 # Apply changes
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28837 diff changeset	3739 fp = stringio()
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3740 for c in chunks:
29498 1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3741 # Create a backup file only if this hunk should be backed up
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3742 if ishunk(c) and c.header.filename() in tobackup:
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3743 abs = c.header.filename()
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3744 target = repo.wjoin(abs)
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3745 bakname = scmutil.origpath(repo.ui, repo, m.rel(abs))
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3746 util.copyfile(target, bakname)
1b38cfde9530 revert: don't backup if no files reverted in interactive mode (issue4793) skarlage <skarlage@fb.com> parents: 29427 diff changeset	3747 tobackup.remove(abs)
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3748 c.write(fp)
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3749 dopatch = fp.tell()
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3750 fp.seek(0)
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3751 if dopatch:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3752 try:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3753 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	3754 except patch.PatchError as err:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	3755 raise error.Abort(str(err))
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3756 del fp
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3757 else:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3758 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	3759 checkout(f)
24359 521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3760 if normal:
521fe8287dd5 revert: add flag to make revert interactive Laurent Charignon <lcharignon@fb.com> parents: 24358 diff changeset	3761 normal(f)
20571 d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3762
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3763 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	3764 # 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	3765 if f not in newlyaddedandmodifiedfiles:
5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3766 checkout(f)
5b05f10c5024 revert: fix edition of newly added file during --interactive Laurent Charignon <lcharignon@fb.com> parents: 25258 diff changeset	3767 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	3768
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3769 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	3770 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	3771 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	3772 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	3773 checkout(f)
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3774 normal(f)
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3775
d4893e64f300 revert: extract actual revert in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20553 diff changeset	3776 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	3777
21576 33395a7e5527 revert: group action into a single dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 21575 diff changeset	3778 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	3779 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	3780 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	3781
32343 d47d7d3bd07b extensions: show deprecation warning for the use of cmdutil.command Yuya Nishihara <yuya@tcha.org> parents: 32337 diff changeset	3782 class command(registrar.command):
d47d7d3bd07b extensions: show deprecation warning for the use of cmdutil.command Yuya Nishihara <yuya@tcha.org> parents: 32337 diff changeset	3783 def _doregister(self, func, name, args, *kwargs):
d47d7d3bd07b extensions: show deprecation warning for the use of cmdutil.command Yuya Nishihara <yuya@tcha.org> parents: 32337 diff changeset	3784 func._deprecatedregistrar = True # flag for deprecwarn in extensions.py
d47d7d3bd07b extensions: show deprecation warning for the use of cmdutil.command Yuya Nishihara <yuya@tcha.org> parents: 32337 diff changeset	3785 return super(command, self)._doregister(func, name, args, *kwargs)
19211 3bfd7f1e7485 summary: augment output with info from extensions Bryan O'Sullivan <bryano@fb.com> parents: 19129 diff changeset	3786
21051 1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3787 # 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	3788 # 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	3789 # "findcommonoutgoing()"
1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3790 outgoinghooks = util.hooks()
1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21047 diff changeset	3791
19211 3bfd7f1e7485 summary: augment output with info from extensions Bryan O'Sullivan <bryano@fb.com> parents: 19129 diff changeset	3792 # 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	3793 summaryhooks = util.hooks()
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3794
21047 f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3795 # 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	3796 #
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3797 # 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	3798 # (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	3799 #
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3800 # 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	3801 # - (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	3802 # - (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	3803 summaryremotehooks = util.hooks()
f0003f989e72 summary: introduce "summaryremotehooks" to avoid redundant incoming/outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21041 diff changeset	3804
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3805 # 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	3806 # 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	3807 # note: bisect is intentionally excluded
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3808 # (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	3809 unfinishedstates = [
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3810 ('graftstate', True, False, _('graft in progress'),
19482 499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19474 diff changeset	3811 _("use 'hg graft --continue' or 'hg update' to abort")),
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3812 ('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	3813 _("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	3814 ]
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3815
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3816 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	3817 '''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	3818 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	3819 bailifchanged().
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3820 '''
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3821 for f, clearable, allowcommit, msg, hint in unfinishedstates:
607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3822 if commit and allowcommit:
607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3823 continue
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3824 if repo.vfs.exists(f):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	3825 raise error.Abort(msg, hint=hint)
19474 894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3826
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3827 def clearunfinished(repo):
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3828 '''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	3829 that are clearable.
894fd1a7c533 cmdutil: core functionality to block during multistep commands (issue3955) Matt Mackall <mpm@selenic.com> parents: 19293 diff changeset	3830 '''
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3831 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	3832 if not clearable and repo.vfs.exists(f):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	3833 raise error.Abort(msg, hint=hint)
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19482 diff changeset	3834 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	3835 if clearable and repo.vfs.exists(f):
31320 1b0db28dadf1 cmdutil: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31309 diff changeset	3836 util.unlink(repo.vfs.join(f))
24991 4169a4f83548 cmdutil: add class to restore dirstate during unexpected failure FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24988 diff changeset	3837
27624 d46db4390715 resolve: suggest the next action timeless <timeless@mozdev.org> parents: 27622 diff changeset	3838 afterresolvedstates = [
27625 cdb9493a7e2f graft: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27624 diff changeset	3839 ('graftstate',
cdb9493a7e2f graft: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27624 diff changeset	3840 _('hg graft --continue')),
27624 d46db4390715 resolve: suggest the next action timeless <timeless@mozdev.org> parents: 27622 diff changeset	3841 ]
d46db4390715 resolve: suggest the next action timeless <timeless@mozdev.org> parents: 27622 diff changeset	3842
28120 ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3843 def howtocontinue(repo):
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3844 '''Check for an unfinished operation and return the command to finish
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3845 it.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3846
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30272 diff changeset	3847 afterresolvedstates tuples define a .hg/{file} and the corresponding
28120 ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3848 command needed to finish it.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3849
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3850 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3851 a boolean.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3852 '''
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3853 contmsg = _("continue: %s")
27624 d46db4390715 resolve: suggest the next action timeless <timeless@mozdev.org> parents: 27622 diff changeset	3854 for f, msg in afterresolvedstates:
d46db4390715 resolve: suggest the next action timeless <timeless@mozdev.org> parents: 27622 diff changeset	3855 if repo.vfs.exists(f):
28120 ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3856 return contmsg % msg, True
33362 e48fb90f80c8 cmdutil: simplify the dirty check in howtocontinue() Matt Harbison <matt_harbison@yahoo.com> parents: 33334 diff changeset	3857 if repo[None].dirty(missing=True, merge=False, branch=False):
28120 ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3858 return contmsg % _("hg commit"), False
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3859 return None, None
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3860
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3861 def checkafterresolved(repo):
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3862 '''Inform the user about the next action after completing hg resolve
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3863
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3864 If there's a matching afterresolvedstates, howtocontinue will yield
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3865 repo.ui.warn as the reporter.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3866
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3867 Otherwise, it will yield repo.ui.note.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3868 '''
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3869 msg, warning = howtocontinue(repo)
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3870 if msg is not None:
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3871 if warning:
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3872 repo.ui.warn("%s\n" % msg)
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3873 else:
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3874 repo.ui.note("%s\n" % msg)
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3875
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3876 def wrongtooltocontinue(repo, task):
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3877 '''Raise an abort suggesting how to properly continue if there is an
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3878 active task.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3879
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3880 Uses howtocontinue() to find the active task.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3881
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3882 If there's no task (repo.ui.note for 'hg commit'), it does not offer
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3883 a hint.
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3884 '''
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3885 after = howtocontinue(repo)
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3886 hint = None
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3887 if after[1]:
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3888 hint = after[0]
ed4d06f180b8 cmdutil: provide a way to report how to continue timeless <timeless@mozdev.org> parents: 28027 diff changeset	3889 raise error.Abort(_('no %s in progress') % task, hint=hint)

Mercurial > public > mercurial-scm > hg

annotate mercurial/cmdutil.py @ 34189:e9898ad31115