mercurial-scm/hg-stable: mercurial/scmutil.py annotate

annotate mercurial/scmutil.py @ 43106:d783f945a701

py3: finish porting iteritems() to pycompat and remove source transformer This commit finishes porting .iteritems() to pycompat.iteritems() for the mercurial package. The translation of .iteritems() to .items() was the last conversion performed by the source transformer. With the porting to pycompat complete, we no longer have a need for the source transformer. So the source transformer has been removed. Good riddance! The code base is now compatible with Python 2 and Python 3. For the record, as the person who introduced the source transformer, it brings me joy to delete it. It accomplished its goal to facilitate a port to Python 3 without overly burdening people on some painful low-level differences between Python 2 and 3. It is unfortunate we still have to wallpaper over many differences with the pycompat shim. But it is what it is. Differential Revision: https://phab.mercurial-scm.org/D7015

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 07 Oct 2019 00:04:04 -0400
parents	c59eb1560c44
children	54e943b28101

rev	line source
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	1 # scmutil.py - Mercurial core utility functions
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	2 #
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	3 # Copyright Matt Mackall <mpm@selenic.com>
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	4 #
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	7
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	8 from __future__ import absolute_import
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	9
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	10 import errno
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	11 import glob
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29336 diff changeset	12 import hashlib
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	13 import os
41661 f8b18583049f add: pass around uipathfn and use instead of m.rel() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41660 diff changeset	14 import posixpath
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	15 import re
34462 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	16 import subprocess
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33246 diff changeset	17 import weakref
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	18
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	19 from .i18n import _
32678 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	20 from .node import (
37528 d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	21 bin,
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	22 hex,
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	23 nullid,
39899 d739f423bf06 repo: look up nullrev context by revnum, not symbolic name Martin von Zweigbergk <martinvonz@google.com> parents: 39896 diff changeset	24 nullrev,
34334 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	25 short,
32678 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	26 wdirid,
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	27 wdirrev,
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	28 )
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	29 from .pycompat import getattr
32678 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	30
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	31 from . import (
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	32 copies as copiesmod,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	33 encoding,
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	34 error,
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	35 match as matchmod,
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	36 obsolete,
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33246 diff changeset	37 obsutil,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	38 pathutil,
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	39 phases,
39254 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	40 policy,
30318 af7c60988f6e py3: make scmutil.rcpath() return bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 30109 diff changeset	41 pycompat,
31044 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 30644 diff changeset	42 revsetlang,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	43 similar,
39902 a477679f6323 pullreport: skip filtered revs instead of obsolete ones Boris Feld <boris.feld@octobus.net> parents: 39899 diff changeset	44 smartset,
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	45 url,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	46 util,
34543 6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	47 vfs,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	48 )
18690 4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	49
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36844 diff changeset	50 from .utils import (
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37097 diff changeset	51 procutil,
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36844 diff changeset	52 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36844 diff changeset	53 )
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36844 diff changeset	54
34645 75979c8d4572 codemod: use pycompat.iswindows Jun Wu <quark@fb.com> parents: 34620 diff changeset	55 if pycompat.iswindows:
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	56 from . import scmwindows as scmplatform
18690 4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	57 else:
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	58 from . import scmposix as scmplatform
18690 4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	59
39254 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	60 parsers = policy.importmod(r'parsers')
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	61
30327 365812902904 scmutil: extend termwidth() to return terminal height, renamed to termsize() Yuya Nishihara <yuya@tcha.org> parents: 30322 diff changeset	62 termsize = scmplatform.termsize
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	63
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	64
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	65 class status(tuple):
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	66 '''Named tuple with a list of files per status. The 'deleted', 'unknown'
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	67 and 'ignored' properties are only relevant to the working copy.
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	68 '''
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	69
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	70 __slots__ = ()
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	71
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	72 def __new__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	73 cls, modified, added, removed, deleted, unknown, ignored, clean
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	74 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	75 return tuple.__new__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	76 cls, (modified, added, removed, deleted, unknown, ignored, clean)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	77 )
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	78
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	79 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	80 def modified(self):
22915 4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	81 '''files that have been modified'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	82 return self[0]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	83
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	84 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	85 def added(self):
22915 4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	86 '''files that have been added'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	87 return self[1]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	88
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	89 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	90 def removed(self):
22915 4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	91 '''files that have been removed'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	92 return self[2]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	93
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	94 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	95 def deleted(self):
22915 4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	96 '''files that are in the dirstate, but have been deleted from the
4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	97 working copy (aka "missing")
4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	98 '''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	99 return self[3]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	100
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	101 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	102 def unknown(self):
22915 4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	103 '''files not in the dirstate that are not ignored'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	104 return self[4]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	105
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	106 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	107 def ignored(self):
22915 4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	108 '''files not in the dirstate that are ignored (by _dirignore())'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	109 return self[5]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	110
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	111 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	112 def clean(self):
22915 4d680deb0d9e status: update and move documentation of status types to status class Martin von Zweigbergk <martinvonz@gmail.com> parents: 22913 diff changeset	113 '''files that have not been modified'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	114 return self[6]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	115
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	116 def __repr__(self, args, *kwargs):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	117 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	118 r'<status modified=%s, added=%s, removed=%s, deleted=%s, '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	119 r'unknown=%s, ignored=%s, clean=%s>'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	120 ) % tuple(pycompat.sysstr(stringutil.pprint(v)) for v in self)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	121
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	122
20392 d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	123 def itersubrepos(ctx1, ctx2):
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	124 """find subrepos in ctx1 or ctx2"""
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	125 # Create a (subpath, ctx) mapping where we prefer subpaths from
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	126 # ctx1. The subpaths from ctx2 are important when the .hgsub file
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	127 # has been modified (in ctx2) but not yet committed (in ctx1).
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	128 subpaths = dict.fromkeys(ctx2.substate, ctx2)
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	129 subpaths.update(dict.fromkeys(ctx1.substate, ctx1))
25418 c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	130
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	131 missing = set()
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	132
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	133 for subpath in ctx2.substate:
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	134 if subpath not in ctx1.substate:
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	135 del subpaths[subpath]
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	136 missing.add(subpath)
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	137
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	138 for subpath, ctx in sorted(pycompat.iteritems(subpaths)):
20392 d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	139 yield subpath, ctx.sub(subpath)
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	140
25418 c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	141 # Yield an empty subrepo based on ctx1 for anything only in ctx2. That way,
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	142 # status and diff will have an accurate result when it does
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	143 # 'sub.{status\|diff}(rev2)'. Otherwise, the ctx2 subrepo is compared
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	144 # against itself.
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	145 for subpath in missing:
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	146 yield subpath, ctx2.nullsub(subpath, ctx1)
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	147
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	148
17248 6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	149 def nochangesfound(ui, repo, excluded=None):
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	150 '''Report no changes for push/pull, excluded is None or a list of
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	151 nodes excluded from the push/pull.
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	152 '''
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	153 secretlist = []
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	154 if excluded:
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	155 for n in excluded:
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	156 ctx = repo[n]
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	157 if ctx.phase() >= phases.secret and not ctx.extinct():
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	158 secretlist.append(n)
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	159
15993 0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	160 if secretlist:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	161 ui.status(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	162 _(b"no changes found (ignored %d secret changesets)\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	163 % len(secretlist)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	164 )
15993 0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	165 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	166 ui.status(_(b"no changes found\n"))
15993 0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	167
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	168
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	169 def callcatch(ui, func):
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	170 """call func() with global exception handling
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	171
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	172 return func() if no exception happens. otherwise do some error handling
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	173 and return an exit code accordingly. does not handle all exceptions.
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	174 """
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	175 try:
32041 38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	176 try:
38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	177 return func()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	178 except: # re-raises
32041 38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	179 ui.traceback()
38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	180 raise
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	181 # Global exception handling, alphabetically
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	182 # Mercurial-specific first, followed by built-in and library exceptions
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	183 except error.LockHeld as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	184 if inst.errno == errno.ETIMEDOUT:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	185 reason = _(b'timed out waiting for lock held by %r') % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	186 pycompat.bytestr(inst.locker)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	187 )
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	188 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	189 reason = _(b'lock held by %r') % inst.locker
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	190 ui.error(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	191 _(b"abort: %s: %s\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	192 % (inst.desc or stringutil.forcebytestr(inst.filename), reason)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	193 )
32088 0d892d820a51 lock: avoid unintentional lock acquisition at failure of readlock FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32041 diff changeset	194 if not inst.locker:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	195 ui.error(_(b"(lock might be very busy)\n"))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	196 except error.LockUnavailable as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	197 ui.error(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	198 _(b"abort: could not lock %s: %s\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	199 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	200 inst.desc or stringutil.forcebytestr(inst.filename),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	201 encoding.strtolocal(inst.strerror),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	202 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	203 )
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	204 except error.OutOfBandError as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	205 if inst.args:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	206 msg = _(b"abort: remote error:\n")
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	207 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	208 msg = _(b"abort: remote error\n")
38809 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	209 ui.error(msg)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	210 if inst.args:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	211 ui.error(b''.join(inst.args))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	212 if inst.hint:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	213 ui.error(b'(%s)\n' % inst.hint)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	214 except error.RepoError as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	215 ui.error(_(b"abort: %s!\n") % inst)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	216 if inst.hint:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	217 ui.error(_(b"(%s)\n") % inst.hint)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	218 except error.ResponseError as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	219 ui.error(_(b"abort: %s") % inst.args[0])
36690 b76248e51605 scmutil: avoid using basestring and add explicit handling of unicodes Augie Fackler <augie@google.com> parents: 36687 diff changeset	220 msg = inst.args[1]
b76248e51605 scmutil: avoid using basestring and add explicit handling of unicodes Augie Fackler <augie@google.com> parents: 36687 diff changeset	221 if isinstance(msg, type(u'')):
b76248e51605 scmutil: avoid using basestring and add explicit handling of unicodes Augie Fackler <augie@google.com> parents: 36687 diff changeset	222 msg = pycompat.sysbytes(msg)
36720 c442c4a92ae8 scmutil: fix oversight in b76248e51605c6 where I forgot to use msg Augie Fackler <augie@google.com> parents: 36690 diff changeset	223 if not isinstance(msg, bytes):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	224 ui.error(b" %r\n" % (msg,))
36720 c442c4a92ae8 scmutil: fix oversight in b76248e51605c6 where I forgot to use msg Augie Fackler <augie@google.com> parents: 36690 diff changeset	225 elif not msg:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	226 ui.error(_(b" empty string\n"))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	227 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	228 ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	229 except error.CensoredNodeError as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	230 ui.error(_(b"abort: file censored %s!\n") % inst)
39793 b63dee7bd0d9 global: replace most uses of RevlogError with StorageError (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39710 diff changeset	231 except error.StorageError as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	232 ui.error(_(b"abort: %s!\n") % inst)
40699 4ec8bee15930 scmutil: display the optional hint when handling StorageError in catchall() Matt Harbison <matt_harbison@yahoo.com> parents: 40679 diff changeset	233 if inst.hint:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	234 ui.error(_(b"(%s)\n") % inst.hint)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	235 except error.InterventionRequired as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	236 ui.error(b"%s\n" % inst)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	237 if inst.hint:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	238 ui.error(_(b"(%s)\n") % inst.hint)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	239 return 1
32679 7b17f9de6d3e revlog: map rev(wdirid) to WdirUnsupported exception Yuya Nishihara <yuya@tcha.org> parents: 32678 diff changeset	240 except error.WdirUnsupported:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	241 ui.error(_(b"abort: working directory revision cannot be specified\n"))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	242 except error.Abort as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	243 ui.error(_(b"abort: %s\n") % inst)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	244 if inst.hint:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	245 ui.error(_(b"(%s)\n") % inst.hint)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	246 except ImportError as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	247 ui.error(_(b"abort: %s!\n") % stringutil.forcebytestr(inst))
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36844 diff changeset	248 m = stringutil.forcebytestr(inst).split()[-1]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	249 if m in b"mpatch bdiff".split():
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	250 ui.error(_(b"(did you forget to compile extensions?)\n"))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	251 elif m in b"zlib".split():
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	252 ui.error(_(b"(is your Python install correct?)\n"))
41443 f83b230b7fb3 dispatch: unify handler of IOError and OSError Yuya Nishihara <yuya@tcha.org> parents: 41442 diff changeset	253 except (IOError, OSError) as inst:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	254 if util.safehasattr(inst, b"code"): # HTTPError
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	255 ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	256 elif util.safehasattr(inst, b"reason"): # URLError or SSLError
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	257 try: # usually it is in the form (errno, strerror)
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	258 reason = inst.reason.args[1]
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	259 except (AttributeError, IndexError):
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	260 # it might be anything, for example a string
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	261 reason = inst.reason
38321 79dd61a4554f py3: replace `unicode` with pycompat.unicode Pulkit Goyal <7895pulkit@gmail.com> parents: 38262 diff changeset	262 if isinstance(reason, pycompat.unicode):
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	263 # SSLError of Python 2.7.9 contains a unicode
32201 994b0b1c77d6 py3: use encoding.unitolocal instead of .encode(encoding.encoding) Pulkit Goyal <7895pulkit@gmail.com> parents: 32169 diff changeset	264 reason = encoding.unitolocal(reason)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	265 ui.error(_(b"abort: error: %s\n") % reason)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	266 elif (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	267 util.safehasattr(inst, b"args")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	268 and inst.args
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	269 and inst.args[0] == errno.EPIPE
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	270 ):
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	271 pass
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	272 elif getattr(inst, "strerror", None): # common IOError or OSError
41442 b6673e9bdcf6 dispatch: quote filename in IOError as well Yuya Nishihara <yuya@tcha.org> parents: 41441 diff changeset	273 if getattr(inst, "filename", None) is not None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	274 ui.error(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	275 _(b"abort: %s: '%s'\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	276 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	277 encoding.strtolocal(inst.strerror),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	278 stringutil.forcebytestr(inst.filename),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	279 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	280 )
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	281 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	282 ui.error(_(b"abort: %s\n") % encoding.strtolocal(inst.strerror))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	283 else: # suspicious IOError
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	284 raise
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	285 except MemoryError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	286 ui.error(_(b"abort: out of memory\n"))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	287 except SystemExit as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	288 # Commands shouldn't sys.exit directly, but give a return code.
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	289 # Just in case catch this and and pass exit code to caller.
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	290 return inst.code
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	291
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	292 return -1
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30427 diff changeset	293
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	294
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	295 def checknewlabel(repo, lbl, kind):
19070 290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18951 diff changeset	296 # Do not use the "kind" parameter in ui output.
290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18951 diff changeset	297 # It makes strings difficult to translate.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	298 if lbl in [b'tip', b'.', b'null']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	299 raise error.Abort(_(b"the name '%s' is reserved") % lbl)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	300 for c in (b':', b'\0', b'\n', b'\r'):
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	301 if c in lbl:
36598 bb5f5c1c3c1b scmutil: fix a repr in an error message on Python 3 Augie Fackler <augie@google.com> parents: 36452 diff changeset	302 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	303 _(b"%r cannot be used in a name") % pycompat.bytestr(c)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	304 )
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	305 try:
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	306 int(lbl)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	307 raise error.Abort(_(b"cannot use an integer as a name"))
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	308 except ValueError:
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	309 pass
36183 4f3e989536c3 label: enforce the lack of leading or trailing white space Boris Feld <boris.feld@octobus.net> parents: 36175 diff changeset	310 if lbl.strip() != lbl:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	311 raise error.Abort(_(b"leading or trailing whitespace in name %r") % lbl)
17817 b17be267b59c scmutil: add function to validate new branch, tag, and bookmark names Kevin Bullock <kbullock@ringworld.org> parents: 17768 diff changeset	312
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	313
13974 23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	314 def checkfilename(f):
23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	315 '''Check that the filename f is an acceptable filename for a tracked file'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	316 if b'\r' in f or b'\n' in f:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	317 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	318 _(b"'\\n' and '\\r' disallowed in filenames: %r")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	319 % pycompat.bytestr(f)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	320 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	321
13974 23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	322
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	323 def checkportable(ui, f):
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	324 '''Check if filename f is portable and warn or abort depending on config'''
13974 23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	325 checkfilename(f)
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	326 abort, warn = checkportabilityalert(ui)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	327 if abort or warn:
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	328 msg = util.checkwinfilename(f)
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	329 if msg:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	330 msg = b"%s: %s" % (msg, procutil.shellquote(f))
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	331 if abort:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26491 diff changeset	332 raise error.Abort(msg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	333 ui.warn(_(b"warning: %s\n") % msg)
14068 04ce8fa1015d add: notify when adding a file that would cause a case-folding collision Kevin Gessner <kevin@kevingessner.com> parents: 14067 diff changeset	334
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	335
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	336 def checkportabilityalert(ui):
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	337 '''check if the user's config requests nothing, a warning, or abort for
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	338 non-portable filenames'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	339 val = ui.config(b'ui', b'portablefilenames')
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	340 lval = val.lower()
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36844 diff changeset	341 bval = stringutil.parsebool(val)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	342 abort = pycompat.iswindows or lval == b'abort'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	343 warn = bval or lval == b'warn'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	344 if bval is None and not (warn or abort or lval == b'ignore'):
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	345 raise error.ConfigError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	346 _(b"ui.portablefilenames value is invalid ('%s')") % val
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	347 )
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	348 return abort, warn
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	349
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	350
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	351 class casecollisionauditor(object):
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	352 def __init__(self, ui, abort, dirstate):
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	353 self._ui = ui
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	354 self._abort = abort
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	355 allfiles = b'\0'.join(dirstate)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	356 self._loweredfiles = set(encoding.lower(allfiles).split(b'\0'))
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	357 self._dirstate = dirstate
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	358 # The purpose of _newfiles is so that we don't complain about
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	359 # case collisions if someone were to call this object with the
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	360 # same filename twice.
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	361 self._newfiles = set()
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	362
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	363 def __call__(self, f):
20006 9276014db865 scmutil: skip checks in "casecollisionauditor" if filename is already checked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19900 diff changeset	364 if f in self._newfiles:
9276014db865 scmutil: skip checks in "casecollisionauditor" if filename is already checked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19900 diff changeset	365 return
14980 28e98a8b173d i18n: use UTF-8 string to lower filename for case collision check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 14861 diff changeset	366 fl = encoding.lower(f)
20006 9276014db865 scmutil: skip checks in "casecollisionauditor" if filename is already checked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19900 diff changeset	367 if fl in self._loweredfiles and f not in self._dirstate:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	368 msg = _(b'possible case-folding collision for %s') % f
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	369 if self._abort:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26491 diff changeset	370 raise error.Abort(msg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	371 self._ui.warn(_(b"warning: %s\n") % msg)
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	372 self._loweredfiles.add(fl)
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	373 self._newfiles.add(f)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	374
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	375
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	376 def filteredhash(repo, maxrev):
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	377 """build hash of filtered revisions in the current repoview.
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	378
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	379 Multiple caches perform up-to-date validation by checking that the
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	380 tiprev and tipnode stored in the cache file match the current repository.
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	381 However, this is not sufficient for validating repoviews because the set
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	382 of revisions in the view may change without the repository tiprev and
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	383 tipnode changing.
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	384
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	385 This function hashes all the revs filtered from the view and returns
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	386 that SHA-1 digest.
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	387 """
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	388 cl = repo.changelog
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	389 if not cl.filteredrevs:
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	390 return None
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	391 key = None
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	392 revs = sorted(r for r in cl.filteredrevs if r <= maxrev)
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	393 if revs:
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29336 diff changeset	394 s = hashlib.sha1()
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	395 for rev in revs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	396 s.update(b'%d;' % rev)
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	397 key = s.digest()
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	398 return key
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	399
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	400
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	401 def walkrepos(path, followsym=False, seen_dirs=None, recurse=False):
17104 5a9acb0b2086 help: improve hgweb help Mads Kiilerich <mads@kiilerich.com> parents: 17037 diff changeset	402 '''yield every hg repository under path, always recursively.
5a9acb0b2086 help: improve hgweb help Mads Kiilerich <mads@kiilerich.com> parents: 17037 diff changeset	403 The recurse flag will only control recursion into repo working dirs'''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	404
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	405 def errhandler(err):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	406 if err.filename == path:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	407 raise err
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	408
14961 5523529bd1af walkrepos: use getattr instead of hasattr for samestat Augie Fackler <durin42@gmail.com> parents: 14928 diff changeset	409 samestat = getattr(os.path, 'samestat', None)
5523529bd1af walkrepos: use getattr instead of hasattr for samestat Augie Fackler <durin42@gmail.com> parents: 14928 diff changeset	410 if followsym and samestat is not None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	411
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	412 def adddir(dirlst, dirname):
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	413 dirstat = os.stat(dirname)
36371 ddd9474d2e08 walkrepos: don't reimplement any() Martin von Zweigbergk <martinvonz@google.com> parents: 36346 diff changeset	414 match = any(samestat(dirstat, lstdirstat) for lstdirstat in dirlst)
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	415 if not match:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	416 dirlst.append(dirstat)
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	417 return not match
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	418
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	419 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	420 followsym = False
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	421
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	422 if (seen_dirs is None) and followsym:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	423 seen_dirs = []
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	424 adddir(seen_dirs, path)
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	425 for root, dirs, files in os.walk(path, topdown=True, onerror=errhandler):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	426 dirs.sort()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	427 if b'.hg' in dirs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	428 yield root # found a repository
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	429 qroot = os.path.join(root, b'.hg', b'patches')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	430 if os.path.isdir(os.path.join(qroot, b'.hg')):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	431 yield qroot # we have a patch queue repo here
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	432 if recurse:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	433 # avoid recursing inside the .hg directory
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	434 dirs.remove(b'.hg')
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	435 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	436 dirs[:] = [] # don't descend further
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	437 elif followsym:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	438 newdirs = []
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	439 for d in dirs:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	440 fname = os.path.join(root, d)
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	441 if adddir(seen_dirs, fname):
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	442 if os.path.islink(fname):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	443 for hgname in walkrepos(fname, True, seen_dirs):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	444 yield hgname
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	445 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	446 newdirs.append(d)
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	447 dirs[:] = newdirs
13984 af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	448
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	449
32678 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	450 def binnode(ctx):
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	451 """Return binary node id for a given basectx"""
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	452 node = ctx.node()
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	453 if node is None:
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	454 return wdirid
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	455 return node
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32676 diff changeset	456
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	457
32676 4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32310 diff changeset	458 def intrev(ctx):
4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32310 diff changeset	459 """Return integer for a given basectx that can be used in comparison or
24582 56fff44cce98 scmutil: add function to help handling workingctx in arithmetic operation Yuya Nishihara <yuya@tcha.org> parents: 24447 diff changeset	460 arithmetic operation"""
32676 4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32310 diff changeset	461 rev = ctx.rev()
24582 56fff44cce98 scmutil: add function to help handling workingctx in arithmetic operation Yuya Nishihara <yuya@tcha.org> parents: 24447 diff changeset	462 if rev is None:
25739 3dabc9b7494a changeset_printer: use node.wdirrev to calculate meaningful parentrevs Yuya Nishihara <yuya@tcha.org> parents: 25660 diff changeset	463 return wdirrev
24582 56fff44cce98 scmutil: add function to help handling workingctx in arithmetic operation Yuya Nishihara <yuya@tcha.org> parents: 24447 diff changeset	464 return rev
56fff44cce98 scmutil: add function to help handling workingctx in arithmetic operation Yuya Nishihara <yuya@tcha.org> parents: 24447 diff changeset	465
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	466
34334 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	467 def formatchangeid(ctx):
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	468 """Format changectx as '{rev}:{node\|formatnode}', which is the default
35928 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35748 diff changeset	469 template provided by logcmdutil.changesettemplater"""
34334 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	470 repo = ctx.repo()
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	471 return formatrevnode(repo.ui, intrev(ctx), binnode(ctx))
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	472
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	473
34334 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	474 def formatrevnode(ui, rev, node):
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	475 """Format given revision and node depending on the current verbosity"""
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	476 if ui.debugflag:
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	477 hexfunc = hex
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	478 else:
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	479 hexfunc = short
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	480 return b'%d:%s' % (rev, hexfunc(node))
34334 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34158 diff changeset	481
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	482
37678 5f8f013e7d52 scmutil: rename resolvepartialhexnodeid() to resolvehexnodeidprefix() Martin von Zweigbergk <martinvonz@google.com> parents: 37677 diff changeset	483 def resolvehexnodeidprefix(repo, prefix):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	484 if prefix.startswith(b'x') and repo.ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	485 b'experimental', b'revisions.prefixhexnode'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	486 ):
38894 7848f284b211 revisions: allow "x123" to refer to nodeid prefix "123" Martin von Zweigbergk <martinvonz@google.com> parents: 38893 diff changeset	487 prefix = prefix[1:]
38881 503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	488 try:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	489 # Uses unfiltered repo because it's faster when prefix is ambiguous/
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	490 # This matches the shortesthexnodeidprefix() function below.
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	491 node = repo.unfiltered().changelog._partialmatch(prefix)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	492 except error.AmbiguousPrefixLookupError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	493 revset = repo.ui.config(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	494 b'experimental', b'revisions.disambiguatewithin'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	495 )
38881 503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	496 if revset:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	497 # Clear config to avoid infinite recursion
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	498 configoverrides = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	499 (b'experimental', b'revisions.disambiguatewithin'): None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	500 }
38881 503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	501 with repo.ui.configoverride(configoverrides):
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	502 revs = repo.anyrevs([revset], user=True)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	503 matches = []
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	504 for rev in revs:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	505 node = repo.changelog.node(rev)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	506 if hex(node).startswith(prefix):
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	507 matches.append(node)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	508 if len(matches) == 1:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	509 return matches[0]
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38880 diff changeset	510 raise
37504 901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	511 if node is None:
901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	512 return
901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	513 repo.changelog.rev(node) # make sure node isn't filtered
901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	514 return node
901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	515
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	516
38893 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	517 def mayberevnum(repo, prefix):
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	518 """Checks if the given prefix may be mistaken for a revision number"""
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	519 try:
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	520 i = int(prefix)
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	521 # if we are a pure int, then starting with zero will not be
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	522 # confused as a rev; or, obviously, if the int is larger
40341 d916ed3ca951 revisions: when using prefixhexnode, ensure we prefix "0" Kyle Lippincott <spectral@google.com> parents: 40167 diff changeset	523 # than the value of the tip rev. We still need to disambiguate if
d916ed3ca951 revisions: when using prefixhexnode, ensure we prefix "0" Kyle Lippincott <spectral@google.com> parents: 40167 diff changeset	524 # prefix == '0', since that is a valid revnum.
d916ed3ca951 revisions: when using prefixhexnode, ensure we prefix "0" Kyle Lippincott <spectral@google.com> parents: 40167 diff changeset	525 if (prefix != b'0' and prefix[0:1] == b'0') or i >= len(repo):
38893 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	526 return False
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	527 return True
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	528 except ValueError:
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	529 return False
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	530
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	531
38892 3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	532 def shortesthexnodeidprefix(repo, node, minlength=1, cache=None):
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	533 """Find the shortest unambiguous prefix that matches hexnode.
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	534
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	535 If "cache" is not None, it must be a dictionary that can be used for
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	536 caching between calls to this method.
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	537 """
37708 8e8541610d85 scmutil: make shortesthexnodeidprefix() use unfiltered repo Martin von Zweigbergk <martinvonz@google.com> parents: 37680 diff changeset	538 # _partialmatch() of filtered changelog could take O(len(repo)) time,
8e8541610d85 scmutil: make shortesthexnodeidprefix() use unfiltered repo Martin von Zweigbergk <martinvonz@google.com> parents: 37680 diff changeset	539 # which would be unacceptably slow. so we look for hash collision in
8e8541610d85 scmutil: make shortesthexnodeidprefix() use unfiltered repo Martin von Zweigbergk <martinvonz@google.com> parents: 37680 diff changeset	540 # unfiltered space, which means some hashes may be slightly longer.
38015 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	541
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	542 minlength = max(minlength, 1)
40403 bf249bb60087 shortest: never emit 0-length prefix even if unique Martin von Zweigbergk <martinvonz@google.com> parents: 40367 diff changeset	543
38015 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	544 def disambiguate(prefix):
3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	545 """Disambiguate against revnums."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	546 if repo.ui.configbool(b'experimental', b'revisions.prefixhexnode'):
38895 a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38894 diff changeset	547 if mayberevnum(repo, prefix):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	548 return b'x' + prefix
38895 a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38894 diff changeset	549 else:
a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38894 diff changeset	550 return prefix
a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38894 diff changeset	551
38015 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	552 hexnode = hex(node)
38023 5ac72e07692a shortest: avoid magic number "41" Martin von Zweigbergk <martinvonz@google.com> parents: 38015 diff changeset	553 for length in range(len(prefix), len(hexnode) + 1):
38015 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	554 prefix = hexnode[:length]
38893 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	555 if not mayberevnum(repo, prefix):
38015 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	556 return prefix
3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	557
38893 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38892 diff changeset	558 cl = repo.unfiltered().changelog
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	559 revset = repo.ui.config(b'experimental', b'revisions.disambiguatewithin')
38882 6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	560 if revset:
38892 3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	561 revs = None
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	562 if cache is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	563 revs = cache.get(b'disambiguationrevset')
38892 3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	564 if revs is None:
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	565 revs = repo.anyrevs([revset], user=True)
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38882 diff changeset	566 if cache is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	567 cache[b'disambiguationrevset'] = revs
38882 6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	568 if cl.rev(node) in revs:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	569 hexnode = hex(node)
39254 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	570 nodetree = None
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	571 if cache is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	572 nodetree = cache.get(b'disambiguationnodetree')
39254 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	573 if not nodetree:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	574 try:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	575 nodetree = parsers.nodetree(cl.index, len(revs))
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	576 except AttributeError:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	577 # no native nodetree
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	578 pass
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	579 else:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	580 for r in revs:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	581 nodetree.insert(r)
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	582 if cache is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	583 cache[b'disambiguationnodetree'] = nodetree
39254 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	584 if nodetree is not None:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	585 length = max(nodetree.shortest(node), minlength)
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	586 prefix = hexnode[:length]
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39125 diff changeset	587 return disambiguate(prefix)
38882 6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	588 for length in range(minlength, len(hexnode) + 1):
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	589 matches = []
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	590 prefix = hexnode[:length]
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	591 for rev in revs:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	592 otherhexnode = repo[rev].hex()
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	593 if prefix == otherhexnode[:length]:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	594 matches.append(otherhexnode)
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	595 if len(matches) == 1:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	596 return disambiguate(prefix)
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38881 diff changeset	597
37909 da083d9fafab shortest: don't keep checking for longer prefix if node doesn't exist (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37767 diff changeset	598 try:
38015 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 38004 diff changeset	599 return disambiguate(cl.shortest(node, minlength))
37909 da083d9fafab shortest: don't keep checking for longer prefix if node doesn't exist (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37767 diff changeset	600 except error.LookupError:
da083d9fafab shortest: don't keep checking for longer prefix if node doesn't exist (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37767 diff changeset	601 raise error.RepoLookupError()
37680 e743b8524d60 scmutil: introduce shortesthexnodeidprefix() Martin von Zweigbergk <martinvonz@google.com> parents: 37679 diff changeset	602
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	603
37350 e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	604 def isrevsymbol(repo, symbol):
37677 41ac707322ba scmutil: document that isrevsymbol() raises on ambiguous node prefix Martin von Zweigbergk <martinvonz@google.com> parents: 37531 diff changeset	605 """Checks if a symbol exists in the repo.
41ac707322ba scmutil: document that isrevsymbol() raises on ambiguous node prefix Martin von Zweigbergk <martinvonz@google.com> parents: 37531 diff changeset	606
38880 df0873ab5c14 revlog: use specialized exception for ambiguous prefix lookup Martin von Zweigbergk <martinvonz@google.com> parents: 38839 diff changeset	607 See revsymbol() for details. Raises error.AmbiguousPrefixLookupError if the
df0873ab5c14 revlog: use specialized exception for ambiguous prefix lookup Martin von Zweigbergk <martinvonz@google.com> parents: 38839 diff changeset	608 symbol is an ambiguous nodeid prefix.
37677 41ac707322ba scmutil: document that isrevsymbol() raises on ambiguous node prefix Martin von Zweigbergk <martinvonz@google.com> parents: 37531 diff changeset	609 """
37350 e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	610 try:
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	611 revsymbol(repo, symbol)
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	612 return True
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	613 except error.RepoLookupError:
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	614 return False
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	615
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	616
37273 0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	617 def revsymbol(repo, symbol):
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	618 """Returns a context given a single revision symbol (as string).
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	619
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	620 This is similar to revsingle(), but accepts only a single revision symbol,
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	621 i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	622 not "max(public())".
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	623 """
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	624 if not isinstance(symbol, bytes):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	625 msg = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	626 b"symbol (%s of type %s) was not a string, did you mean "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	627 b"repo[symbol]?" % (symbol, type(symbol))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	628 )
37273 0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	629 raise error.ProgrammingError(msg)
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	630 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	631 if symbol in (b'.', b'tip', b'null'):
37527 1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	632 return repo[symbol]
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	633
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	634 try:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	635 r = int(symbol)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	636 if b'%d' % r != symbol:
37527 1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	637 raise ValueError
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	638 l = len(repo.changelog)
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	639 if r < 0:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	640 r += l
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	641 if r < 0 or r >= l and r != wdirrev:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	642 raise ValueError
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	643 return repo[r]
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	644 except error.FilteredIndexError:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	645 raise
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	646 except (ValueError, OverflowError, IndexError):
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	647 pass
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	648
37528 d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	649 if len(symbol) == 40:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	650 try:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	651 node = bin(symbol)
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	652 rev = repo.changelog.rev(node)
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	653 return repo[rev]
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	654 except error.FilteredLookupError:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	655 raise
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	656 except (TypeError, LookupError):
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	657 pass
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	658
37529 45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	659 # look up bookmarks through the name interface
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	660 try:
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	661 node = repo.names.singlenode(repo, symbol)
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	662 rev = repo.changelog.rev(node)
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	663 return repo[rev]
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	664 except KeyError:
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	665 pass
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	666
37679 ab828755e1ea scmutil: use resolvehexnodeidprefix() from revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37678 diff changeset	667 node = resolvehexnodeidprefix(repo, symbol)
37530 35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	668 if node is not None:
35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	669 rev = repo.changelog.rev(node)
35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	670 return repo[rev]
35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	671
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	672 raise error.RepoLookupError(_(b"unknown revision '%s'") % symbol)
37527 1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	673
37528 d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	674 except error.WdirUnsupported:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	675 return repo[None]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	676 except (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	677 error.FilteredIndexError,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	678 error.FilteredLookupError,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	679 error.FilteredRepoLookupError,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	680 ):
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	681 raise _filterederror(repo, symbol)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	682
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	683
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	684 def _filterederror(repo, changeid):
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	685 """build an exception to be raised about a filtered changeid
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	686
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	687 This is extracted in a function to help extensions (eg: evolve) to
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	688 experiment with various message variants."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	689 if repo.filtername.startswith(b'visible'):
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	690
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	691 # Check if the changeset is obsolete
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	692 unfilteredrepo = repo.unfiltered()
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	693 ctx = revsymbol(unfilteredrepo, changeid)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	694
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	695 # If the changeset is obsolete, enrich the message with the reason
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	696 # that made this changeset not visible
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	697 if ctx.obsolete():
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	698 msg = obsutil._getfilteredreason(repo, changeid, ctx)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	699 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	700 msg = _(b"hidden revision '%s'") % changeid
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	701
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	702 hint = _(b'use --hidden to access hidden revisions')
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	703
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	704 return error.FilteredRepoLookupError(msg, hint=hint)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	705 msg = _(b"filtered revision '%s' (not in '%s' subset)")
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	706 msg %= (changeid, repo.filtername)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	707 return error.FilteredRepoLookupError(msg)
37273 0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37271 diff changeset	708
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	709
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	710 def revsingle(repo, revspec, default=b'.', localalias=None):
19509 8963a706e075 revsingle: fix silly API issue (issue2992) Matt Mackall <mpm@selenic.com> parents: 19154 diff changeset	711 if not revspec and revspec != 0:
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	712 return repo[default]
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	713
34023 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 33819 diff changeset	714 l = revrange(repo, [revspec], localalias=localalias)
22814 8110405cf8ae revset-limit: use boolean testing instead of `len(revs) < 1` Pierre-Yves David <pierre-yves.david@fb.com> parents: 21799 diff changeset	715 if not l:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	716 raise error.Abort(_(b'empty revision set'))
22815 4f81470e83bf revsingle: use `last` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22814 diff changeset	717 return repo[l.last()]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	718
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	719
26020 cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	720 def _pairspec(revspec):
31044 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 30644 diff changeset	721 tree = revsetlang.parse(revspec)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	722 return tree and tree[0] in (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	723 b'range',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	724 b'rangepre',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	725 b'rangepost',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	726 b'rangeall',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	727 )
26020 cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	728
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	729
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	730 def revpair(repo, revs):
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	731 if not revs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	732 return repo[b'.'], repo[None]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	733
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	734 l = revrange(repo, revs)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	735
41392 a728ef2f9b15 revpair: clarify check for empty revset Martin von Zweigbergk <martinvonz@google.com> parents: 41391 diff changeset	736 if not l:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	737 raise error.Abort(_(b'empty revision range'))
41392 a728ef2f9b15 revpair: clarify check for empty revset Martin von Zweigbergk <martinvonz@google.com> parents: 41391 diff changeset	738
41391 5079242abef9 revpair: simplify revpair by always relying on smartset.first/last Martin von Zweigbergk <martinvonz@google.com> parents: 41288 diff changeset	739 first = l.first()
5079242abef9 revpair: simplify revpair by always relying on smartset.first/last Martin von Zweigbergk <martinvonz@google.com> parents: 41288 diff changeset	740 second = l.last()
20862 97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	741
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	742 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	743 first == second
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	744 and len(revs) >= 2
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	745 and not all(revrange(repo, [r]) for r in revs)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	746 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	747 raise error.Abort(_(b'empty revision on one side of range'))
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	748
26020 cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	749 # if top-level is range expression, the result must always be a pair
cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	750 if first == second and len(revs) == 1 and not _pairspec(revs[0]):
37254 e9ee540af434 scmutil: make revpair() return context objects (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37253 diff changeset	751 return repo[first], repo[None]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	752
37254 e9ee540af434 scmutil: make revpair() return context objects (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37253 diff changeset	753 return repo[first], repo[second]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	754
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	755
34023 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 33819 diff changeset	756 def revrange(repo, specs, localalias=None):
29417 526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	757 """Execute 1 to many revsets and return the union.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	758
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	759 This is the preferred mechanism for executing revsets using user-specified
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	760 config options, such as revset aliases.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	761
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	762 The revsets specified by ``specs`` will be executed via a chained ``OR``
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	763 expression. If ``specs`` is empty, an empty result is returned.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	764
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	765 ``specs`` can contain integers, in which case they are assumed to be
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	766 revision numbers.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	767
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	768 It is assumed the revsets are already formatted. If you have arguments
31044 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 30644 diff changeset	769 that need to be expanded in the revset, call ``revsetlang.formatspec()``
29417 526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	770 and pass the result as an element of ``specs``.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	771
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	772 Specifying a single revset is allowed.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	773
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	774 Returns a ``revset.abstractsmartset`` which is a list-like interface over
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	775 integer revisions.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	776 """
25928 4ee4f7415095 revrange: evaluate all revset specs at once Yuya Nishihara <yuya@tcha.org> parents: 25904 diff changeset	777 allspecs = []
29417 526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	778 for spec in specs:
25904 fbaa2de13cf6 revrange: drop old-style parser in favor of revset (API) Yuya Nishihara <yuya@tcha.org> parents: 25772 diff changeset	779 if isinstance(spec, int):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	780 spec = revsetlang.formatspec(b'%d', spec)
25928 4ee4f7415095 revrange: evaluate all revset specs at once Yuya Nishihara <yuya@tcha.org> parents: 25904 diff changeset	781 allspecs.append(spec)
34023 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 33819 diff changeset	782 return repo.anyrevs(allspecs, user=True, localalias=localalias)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	783
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	784
26433 3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	785 def meaningfulparents(repo, ctx):
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	786 """Return list of meaningful (or all if debug) parentrevs for rev.
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	787
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	788 For merges (two non-nullrev revisions) both parents are meaningful.
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	789 Otherwise the first parent revision is considered meaningful if it
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	790 is not the preceding revision.
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	791 """
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	792 parents = ctx.parents()
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	793 if len(parents) > 1:
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	794 return parents
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	795 if repo.ui.debugflag:
39899 d739f423bf06 repo: look up nullrev context by revnum, not symbolic name Martin von Zweigbergk <martinvonz@google.com> parents: 39896 diff changeset	796 return [parents[0], repo[nullrev]]
32676 4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32310 diff changeset	797 if parents[0].rev() >= intrev(ctx) - 1:
26433 3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	798 return []
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	799 return parents
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	800
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	801
41589 aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	802 def getuipathfn(repo, legacyrelativevalue=False, forcerelativevalue=None):
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	803 """Return a function that produced paths for presenting to the user.
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	804
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	805 The returned function takes a repo-relative path and produces a path
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	806 that can be presented in the UI.
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	807
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	808 Depending on the value of ui.relative-paths, either a repo-relative or
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	809 cwd-relative path will be produced.
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	810
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	811 legacyrelativevalue is the value to use if ui.relative-paths=legacy
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	812
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	813 If forcerelativevalue is not None, then that value will be used regardless
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	814 of what ui.relative-paths is set to.
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	815 """
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	816 if forcerelativevalue is not None:
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	817 relative = forcerelativevalue
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	818 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	819 config = repo.ui.config(b'ui', b'relative-paths')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	820 if config == b'legacy':
41589 aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	821 relative = legacyrelativevalue
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	822 else:
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	823 relative = stringutil.parsebool(config)
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	824 if relative is None:
aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	825 raise error.ConfigError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	826 _(b"ui.relative-paths is not a boolean ('%s')") % config
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	827 )
41589 aec185af621e config: introduce a new value for ui.relative-paths getting old behavior Martin von Zweigbergk <martinvonz@google.com> parents: 41506 diff changeset	828
41505 e6ec0737b706 status: extract helper for producing relative or absolute path for UI Martin von Zweigbergk <martinvonz@google.com> parents: 41443 diff changeset	829 if relative:
e6ec0737b706 status: extract helper for producing relative or absolute path for UI Martin von Zweigbergk <martinvonz@google.com> parents: 41443 diff changeset	830 cwd = repo.getcwd()
e6ec0737b706 status: extract helper for producing relative or absolute path for UI Martin von Zweigbergk <martinvonz@google.com> parents: 41443 diff changeset	831 pathto = repo.pathto
e6ec0737b706 status: extract helper for producing relative or absolute path for UI Martin von Zweigbergk <martinvonz@google.com> parents: 41443 diff changeset	832 return lambda f: pathto(f, cwd)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	833 elif repo.ui.configbool(b'ui', b'slash'):
41695 a8d3a4be066e windows: use util.localpath for repo-relative paths in getuipathfn() Martin von Zweigbergk <martinvonz@google.com> parents: 41687 diff changeset	834 return lambda f: f
41505 e6ec0737b706 status: extract helper for producing relative or absolute path for UI Martin von Zweigbergk <martinvonz@google.com> parents: 41443 diff changeset	835 else:
41695 a8d3a4be066e windows: use util.localpath for repo-relative paths in getuipathfn() Martin von Zweigbergk <martinvonz@google.com> parents: 41687 diff changeset	836 return util.localpath
41505 e6ec0737b706 status: extract helper for producing relative or absolute path for UI Martin von Zweigbergk <martinvonz@google.com> parents: 41443 diff changeset	837
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	838
41661 f8b18583049f add: pass around uipathfn and use instead of m.rel() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41660 diff changeset	839 def subdiruipathfn(subpath, uipathfn):
f8b18583049f add: pass around uipathfn and use instead of m.rel() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41660 diff changeset	840 '''Create a new uipathfn that treats the file as relative to subpath.'''
f8b18583049f add: pass around uipathfn and use instead of m.rel() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41660 diff changeset	841 return lambda f: uipathfn(posixpath.join(subpath, f))
f8b18583049f add: pass around uipathfn and use instead of m.rel() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41660 diff changeset	842
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	843
41663 6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	844 def anypats(pats, opts):
6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	845 '''Checks if any patterns, including --include and --exclude were given.
6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	846
6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	847 Some commands (e.g. addremove) use this condition for deciding whether to
6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	848 print absolute or relative paths.
6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	849 '''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	850 return bool(pats or opts.get(b'include') or opts.get(b'exclude'))
41663 6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	851
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	852
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	853 def expandpats(pats):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	854 '''Expand bare globs when running on windows.
9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	855 On posix we assume it already has already been done by sh.'''
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	856 if not util.expandglobs:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	857 return list(pats)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	858 ret = []
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	859 for kindpat in pats:
9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	860 kind, pat = matchmod._patsplit(kindpat, None)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	861 if kind is None:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	862 try:
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	863 globbed = glob.glob(pat)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	864 except re.error:
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	865 globbed = [pat]
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	866 if globbed:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	867 ret.extend(globbed)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	868 continue
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	869 ret.append(kindpat)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	870 return ret
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	871
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	872
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	873 def matchandpats(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	874 ctx, pats=(), opts=None, globbed=False, default=b'relpath', badfn=None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	875 ):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	876 '''Return a matcher and the patterns that were used.
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	877 The matcher will warn about bad matches, unless an alternate badfn callback
f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	878 is provided.'''
26326 58218b0e6005 match: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26325 diff changeset	879 if opts is None:
58218b0e6005 match: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26325 diff changeset	880 opts = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	881 if not globbed and default == b'relpath':
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	882 pats = expandpats(pats or [])
14670 19197fa4c41c scmutil: match now accepts a context or a repo Matt Mackall <mpm@selenic.com> parents: 14669 diff changeset	883
41676 0ed7a8ac5711 scmutil: respect ui.relative-paths in default match.badfn Martin von Zweigbergk <martinvonz@google.com> parents: 41673 diff changeset	884 uipathfn = getuipathfn(ctx.repo(), legacyrelativevalue=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	885
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	886 def bad(f, msg):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	887 ctx.repo().ui.warn(b"%s: %s\n" % (uipathfn(f), msg))
25466 007a1d53f7c3 scmutil: use the optional badfn argument when building a matcher Matt Harbison <matt_harbison@yahoo.com> parents: 25434 diff changeset	888
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	889 if badfn is None:
f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	890 badfn = bad
f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	891
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	892 m = ctx.match(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	893 pats,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	894 opts.get(b'include'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	895 opts.get(b'exclude'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	896 default,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	897 listsubrepos=opts.get(b'subrepos'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	898 badfn=badfn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	899 )
25466 007a1d53f7c3 scmutil: use the optional badfn argument when building a matcher Matt Harbison <matt_harbison@yahoo.com> parents: 25434 diff changeset	900
24447 d44d53bc9a1e matcher: make e.g. 'relpath:.' lead to fast paths Martin von Zweigbergk <martinvonz@google.com> parents: 24338 diff changeset	901 if m.always():
d44d53bc9a1e matcher: make e.g. 'relpath:.' lead to fast paths Martin von Zweigbergk <martinvonz@google.com> parents: 24338 diff changeset	902 pats = []
16171 336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	903 return m, pats
336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	904
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	905
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	906 def match(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	907 ctx, pats=(), opts=None, globbed=False, default=b'relpath', badfn=None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	908 ):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	909 '''Return a matcher that will warn about bad matches.'''
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	910 return matchandpats(ctx, pats, opts, globbed, default, badfn=badfn)[0]
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	911
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	912
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	913 def matchall(repo):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	914 '''Return a matcher that will efficiently match everything.'''
41687 0531dff73d0b match: delete unused root and cwd arguments from {always,never,exact}() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41677 diff changeset	915 return matchmod.always()
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	916
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	917
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	918 def matchfiles(repo, files, badfn=None):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	919 '''Return a matcher that will efficiently match exactly these files.'''
41687 0531dff73d0b match: delete unused root and cwd arguments from {always,never,exact}() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41677 diff changeset	920 return matchmod.exact(files, badfn=badfn)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	921
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	922
34854 39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	923 def parsefollowlinespattern(repo, rev, pat, msg):
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	924 """Return a file name from `pat` pattern suitable for usage in followlines
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	925 logic.
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	926 """
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	927 if not matchmod.patkind(pat):
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	928 return pathutil.canonpath(repo.root, repo.getcwd(), pat)
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	929 else:
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	930 ctx = repo[rev]
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	931 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=ctx)
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	932 files = [f for f in ctx if m(f)]
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	933 if len(files) != 1:
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	934 raise error.ParseError(msg)
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	935 return files[0]
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	936
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	937
40786 65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	938 def getorigvfs(ui, repo):
65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	939 """return a vfs suitable to save 'orig' file
65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	940
65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	941 return None if no special directory is configured"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	942 origbackuppath = ui.config(b'ui', b'origbackuppath')
40786 65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	943 if not origbackuppath:
65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	944 return None
65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	945 return vfs.vfs(repo.wvfs.join(origbackuppath))
65591a513b9c revert: extract origvfs logic in a sub-function Boris Feld <boris.feld@octobus.net> parents: 40699 diff changeset	946
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	947
41608 8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	948 def backuppath(ui, repo, filepath):
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	949 '''customize where working copy backup files (.orig files) are created
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	950
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	951 Fetch user defined path from config file: [ui] origbackuppath = <path>
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	952 Fall back to default (filepath with .orig suffix) if not specified
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	953
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	954 filepath is repo-relative
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	955
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	956 Returns an absolute path
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	957 '''
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	958 origvfs = getorigvfs(ui, repo)
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	959 if origvfs is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	960 return repo.wjoin(filepath + b".orig")
41608 8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	961
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	962 origbackupdir = origvfs.dirname(filepath)
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	963 if not origvfs.isdir(origbackupdir) or origvfs.islink(origbackupdir):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	964 ui.note(_(b'creating directory: %s\n') % origvfs.join(origbackupdir))
41608 8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	965
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	966 # Remove any files that conflict with the backup file's path
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	967 for f in reversed(list(util.finddirs(filepath))):
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	968 if origvfs.isfileorlink(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	969 ui.note(_(b'removing conflicting file: %s\n') % origvfs.join(f))
41608 8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	970 origvfs.unlink(f)
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	971 break
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	972
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	973 origvfs.makedirs(origbackupdir)
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	974
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	975 if origvfs.isdir(filepath) and not origvfs.islink(filepath):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	976 ui.note(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	977 _(b'removing conflicting directory: %s\n') % origvfs.join(filepath)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	978 )
41608 8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	979 origvfs.rmtree(filepath, forcibly=True)
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	980
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	981 return origvfs.join(filepath)
8785188d1915 scmutil: introduce a new backuppath() to replace origpath() Martin von Zweigbergk <martinvonz@google.com> parents: 41589 diff changeset	982
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	983
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	984 class _containsnode(object):
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	985 """proxy __contains__(node) to container.__contains__ which accepts revs"""
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	986
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	987 def __init__(self, repo, revcontainer):
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	988 self._torev = repo.changelog.rev
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	989 self._revcontains = revcontainer.__contains__
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	990
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	991 def __contains__(self, node):
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	992 return self._revcontains(self._torev(node))
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	993
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	994
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	995 def cleanupnodes(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	996 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	997 replacements,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	998 operation,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	999 moves=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1000 metadata=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1001 fixphase=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1002 targetphase=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1003 backup=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1004 ):
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1005 """do common cleanups when old nodes are replaced by new nodes
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1006
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1007 That includes writing obsmarkers or stripping nodes, and moving bookmarks.
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1008 (we might also want to move working directory parent in the future)
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1009
33686 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1010 By default, bookmark moves are calculated automatically from 'replacements',
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1011 but 'moves' can be used to override that. Also, 'moves' may include
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1012 additional bookmark moves that should not have associated obsmarkers.
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1013
33685 2dbd6d259cd2 cleanupnodes: rename "mapping" to "replacements" Martin von Zweigbergk <martinvonz@google.com> parents: 33684 diff changeset	1014 replacements is {oldnode: [newnode]} or a iterable of nodes if they do not
2dbd6d259cd2 cleanupnodes: rename "mapping" to "replacements" Martin von Zweigbergk <martinvonz@google.com> parents: 33684 diff changeset	1015 have replacements. operation is a string, like "rebase".
34793 3df59451cdec scmutil: add capability to cleanupnodes to take obsmarker metadata Pulkit Goyal <7895pulkit@gmail.com> parents: 34737 diff changeset	1016
3df59451cdec scmutil: add capability to cleanupnodes to take obsmarker metadata Pulkit Goyal <7895pulkit@gmail.com> parents: 34737 diff changeset	1017 metadata is dictionary containing metadata to be stored in obsmarker if
3df59451cdec scmutil: add capability to cleanupnodes to take obsmarker metadata Pulkit Goyal <7895pulkit@gmail.com> parents: 34737 diff changeset	1018 obsolescence is enabled.
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1019 """
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1020 assert fixphase or targetphase is None
33686 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1021 if not replacements and not moves:
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1022 return
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1023
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1024 # translate mapping's other forms
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1025 if not util.safehasattr(replacements, b'items'):
39896 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1026 replacements = {(n,): () for n in replacements}
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1027 else:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1028 # upgrading non tuple "source" to tuple ones for BC
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1029 repls = {}
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1030 for key, value in replacements.items():
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1031 if not isinstance(key, tuple):
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1032 key = (key,)
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1033 repls[key] = value
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1034 replacements = repls
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1035
40873 b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1036 # Unfiltered repo is needed since nodes in replacements might be hidden.
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1037 unfi = repo.unfiltered()
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1038
33684 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33647 diff changeset	1039 # Calculate bookmark movements
33686 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1040 if moves is None:
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1041 moves = {}
40873 b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1042 for oldnodes, newnodes in replacements.items():
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1043 for oldnode in oldnodes:
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1044 if oldnode in moves:
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1045 continue
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1046 if len(newnodes) > 1:
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1047 # usually a split, take the one with biggest rev number
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1048 newnode = next(unfi.set(b'max(%ln)', newnodes)).node()
40873 b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1049 elif len(newnodes) == 0:
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1050 # move bookmark backwards
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1051 allreplaced = []
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1052 for rep in replacements:
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1053 allreplaced.extend(rep)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1054 roots = list(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1055 unfi.set(b'max((::%n) - %ln)', oldnode, allreplaced)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1056 )
40873 b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1057 if roots:
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1058 newnode = roots[0].node()
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1059 else:
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1060 newnode = nullid
39896 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1061 else:
40873 b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1062 newnode = newnodes[0]
b7823bd59b07 cleanupnodes: trust caller when "moves" is not None Martin von Zweigbergk <martinvonz@google.com> parents: 40786 diff changeset	1063 moves[oldnode] = newnode
33684 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33647 diff changeset	1064
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1065 allnewnodes = [n for ns in replacements.values() for n in ns]
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1066 toretract = {}
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1067 toadvance = {}
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1068 if fixphase:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1069 precursors = {}
39896 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1070 for oldnodes, newnodes in replacements.items():
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1071 for oldnode in oldnodes:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1072 for newnode in newnodes:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1073 precursors.setdefault(newnode, []).append(oldnode)
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1074
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1075 allnewnodes.sort(key=lambda n: unfi[n].rev())
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1076 newphases = {}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1077
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1078 def phase(ctx):
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1079 return newphases.get(ctx.node(), ctx.phase())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1080
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1081 for newnode in allnewnodes:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1082 ctx = unfi[newnode]
38437 05b7dd11918e cleanupnodes: preserve phase of parents of new nodes Martin von Zweigbergk <martinvonz@google.com> parents: 38429 diff changeset	1083 parentphase = max(phase(p) for p in ctx.parents())
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1084 if targetphase is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1085 oldphase = max(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1086 unfi[oldnode].phase() for oldnode in precursors[newnode]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1087 )
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1088 newphase = max(oldphase, parentphase)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1089 else:
38437 05b7dd11918e cleanupnodes: preserve phase of parents of new nodes Martin von Zweigbergk <martinvonz@google.com> parents: 38429 diff changeset	1090 newphase = max(targetphase, parentphase)
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1091 newphases[newnode] = newphase
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1092 if newphase > ctx.phase():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1093 toretract.setdefault(newphase, []).append(newnode)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1094 elif newphase < ctx.phase():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1095 toadvance.setdefault(newphase, []).append(newnode)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1096
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1097 with repo.transaction(b'cleanup') as tr:
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1098 # Move bookmarks
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1099 bmarks = repo._bookmarks
33511 9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	1100 bmarkchanges = []
33684 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33647 diff changeset	1101 for oldnode, newnode in moves.items():
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1102 oldbmarks = repo.nodebookmarks(oldnode)
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1103 if not oldbmarks:
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1104 continue
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1105 from . import bookmarks # avoid import cycle
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1106
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1107 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1108 b'moving bookmarks %r from %s to %s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1109 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1110 pycompat.rapply(pycompat.maybebytestr, oldbmarks),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1111 hex(oldnode),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1112 hex(newnode),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1113 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1114 )
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	1115 # Delete divergent bookmarks being parents of related newnodes
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1116 deleterevs = repo.revs(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1117 b'parents(roots(%ln & (::%n))) - parents(%n)',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1118 allnewnodes,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1119 newnode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1120 oldnode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1121 )
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	1122 deletenodes = _containsnode(repo, deleterevs)
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1123 for name in oldbmarks:
33511 9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	1124 bmarkchanges.append((name, newnode))
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	1125 for b in bookmarks.divergent2delete(repo, deletenodes, name):
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	1126 bmarkchanges.append((b, None))
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	1127
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	1128 if bmarkchanges:
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	1129 bmarks.applychanges(repo, tr, bmarkchanges)
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1130
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1131 for phase, nodes in toretract.items():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1132 phases.retractboundary(repo, tr, phase, nodes)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1133 for phase, nodes in toadvance.items():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1134 phases.advanceboundary(repo, tr, phase, nodes)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38425 diff changeset	1135
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1136 mayusearchived = repo.ui.config(b'experimental', b'cleanup-as-archived')
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1137 # Obsolete or strip nodes
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1138 if obsolete.isenabled(repo, obsolete.createmarkersopt):
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1139 # If a node is already obsoleted, and we want to obsolete it
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1140 # without a successor, skip that obssolete request since it's
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1141 # unnecessary. That's the "if s or not isobs(n)" check below.
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1142 # Also sort the node in topology order, that might be useful for
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1143 # some obsstore logic.
40042 ca9d0c93acea cleanupnodes: update comment to drop mention of filtering Boris Feld <boris.feld@octobus.net> parents: 39928 diff changeset	1144 # NOTE: the sorting might belong to createmarkers.
33330 ba43e5ee9c6d scmutil: make cleanupnodes handle filtered node Jun Wu <quark@fb.com> parents: 33252 diff changeset	1145 torev = unfi.changelog.rev
39896 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1146 sortfunc = lambda ns: torev(ns[0][0])
39895 1c3f1491965f scmutil: expand long "one-liner" Boris Feld <boris.feld@octobus.net> parents: 39841 diff changeset	1147 rels = []
39896 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1148 for ns, s in sorted(replacements.items(), key=sortfunc):
39928 61f39a892168 cleanupnodes: pass multiple predecessors to `createmarkers` directly Boris Feld <boris.feld@octobus.net> parents: 39921 diff changeset	1149 rel = (tuple(unfi[n] for n in ns), tuple(unfi[m] for m in s))
61f39a892168 cleanupnodes: pass multiple predecessors to `createmarkers` directly Boris Feld <boris.feld@octobus.net> parents: 39921 diff changeset	1150 rels.append(rel)
33686 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1151 if rels:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1152 obsolete.createmarkers(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1153 repo, rels, operation=operation, metadata=metadata
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1154 )
41804 64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1155 elif phases.supportinternal(repo) and mayusearchived:
64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1156 # this assume we do not have "unstable" nodes above the cleaned ones
64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1157 allreplaced = set()
64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1158 for ns in replacements.keys():
64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1159 allreplaced.update(ns)
64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1160 if backup:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1161 from . import repair # avoid import cycle
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1162
41804 64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1163 node = min(allreplaced, key=repo.changelog.rev)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1164 repair.backupbundle(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1165 repo, allreplaced, allreplaced, node, operation
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1166 )
41804 64de5f44eec3 rewriting: add an option for rewrite commands to use the archived phase Boris Feld <boris.feld@octobus.net> parents: 41790 diff changeset	1167 phases.retractboundary(repo, tr, phases.archived, allreplaced)
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1168 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1169 from . import repair # avoid import cycle
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1170
39896 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39895 diff changeset	1171 tostrip = list(n for ns in replacements for n in ns)
33686 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 33685 diff changeset	1172 if tostrip:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1173 repair.delayedstrip(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1174 repo.ui, repo, tostrip, operation, backup=backup
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1175 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1176
33100 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32679 diff changeset	1177
41663 6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	1178 def addremove(repo, matcher, prefix, uipathfn, opts=None):
26329 d9537ce64f3a addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26328 diff changeset	1179 if opts is None:
d9537ce64f3a addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26328 diff changeset	1180 opts = {}
23533 891aaa7c0c70 scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns Matt Harbison <matt_harbison@yahoo.com> parents: 23481 diff changeset	1181 m = matcher
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1182 dry_run = opts.get(b'dry_run')
37306 6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37273 diff changeset	1183 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1184 similarity = float(opts.get(b'similarity') or 0)
37306 6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37273 diff changeset	1185 except ValueError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1186 raise error.Abort(_(b'similarity must be a number'))
37306 6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37273 diff changeset	1187 if similarity < 0 or similarity > 100:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1188 raise error.Abort(_(b'similarity must be between 0 and 100'))
37306 6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37273 diff changeset	1189 similarity /= 100.0
23533 891aaa7c0c70 scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns Matt Harbison <matt_harbison@yahoo.com> parents: 23481 diff changeset	1190
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1191 ret = 0
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1192
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1193 wctx = repo[None]
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1194 for subpath in sorted(wctx.substate):
29813 35560189677c subrepo: cleanup of subrepo filematcher logic Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29782 diff changeset	1195 submatch = matchmod.subdirmatcher(subpath, m)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1196 if opts.get(b'subrepos') or m.exact(subpath) or any(submatch.files()):
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1197 sub = wctx.sub(subpath)
41640 5ee3c49fc9cd subrepo: adjust subrepo prefix before calling subrepo.addremove() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41617 diff changeset	1198 subprefix = repo.wvfs.reljoin(prefix, subpath)
41663 6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	1199 subuipathfn = subdiruipathfn(subpath, uipathfn)
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1200 try:
41663 6a447a3d1bd0 addremove: pass around uipathfn and use instead of m.uipath() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41661 diff changeset	1201 if sub.addremove(submatch, subprefix, subuipathfn, opts):
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1202 ret = 1
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1203 except error.LookupError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1204 repo.ui.status(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1205 _(b"skipping missing subrepository: %s\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1206 % uipathfn(subpath)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1207 )
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1208
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1209 rejected = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1210
23534 83bbedc16b3f addremove: warn when addremove fails to operate on a named path Matt Harbison <matt_harbison@yahoo.com> parents: 23533 diff changeset	1211 def badfn(f, msg):
83bbedc16b3f addremove: warn when addremove fails to operate on a named path Matt Harbison <matt_harbison@yahoo.com> parents: 23533 diff changeset	1212 if f in m.files():
25434 5984dd42e140 addremove: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25418 diff changeset	1213 m.bad(f, msg)
23534 83bbedc16b3f addremove: warn when addremove fails to operate on a named path Matt Harbison <matt_harbison@yahoo.com> parents: 23533 diff changeset	1214 rejected.append(f)
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1215
25434 5984dd42e140 addremove: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25418 diff changeset	1216 badmatch = matchmod.badmatch(m, badfn)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1217 added, unknown, deleted, removed, forgotten = _interestingfiles(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1218 repo, badmatch
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1219 )
18863 1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1220
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1221 unknownset = set(unknown + forgotten)
18863 1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1222 toprint = unknownset.copy()
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1223 toprint.update(deleted)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1224 for abs in sorted(toprint):
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1225 if repo.ui.verbose or not m.exact(abs):
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1226 if abs in unknownset:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1227 status = _(b'adding %s\n') % uipathfn(abs)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1228 label = b'ui.addremove.added'
18863 1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1229 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1230 status = _(b'removing %s\n') % uipathfn(abs)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1231 label = b'ui.addremove.removed'
39125 ad88726d6982 addremove: add labels for messages about added and removed files Boris Feld <boris.feld@octobus.net> parents: 38895 diff changeset	1232 repo.ui.status(status, label=label)
18863 1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1233
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1234 renames = _findrenames(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1235 repo, m, added + unknown, removed + deleted, similarity, uipathfn
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1236 )
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1237
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1238 if not dry_run:
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1239 _markchanges(repo, unknown + forgotten, deleted, renames)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1240
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1241 for f in rejected:
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1242 if f in m.files():
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1243 return 1
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1244 return ret
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1245
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1246
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1247 def marktouched(repo, files, similarity=0.0):
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1248 '''Assert that files have somehow been operated upon. files are relative to
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1249 the repo root.'''
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	1250 m = matchfiles(repo, files, badfn=lambda x, y: rejected.append(x))
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1251 rejected = []
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1252
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1253 added, unknown, deleted, removed, forgotten = _interestingfiles(repo, m)
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1254
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1255 if repo.ui.verbose:
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1256 unknownset = set(unknown + forgotten)
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1257 toprint = unknownset.copy()
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1258 toprint.update(deleted)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1259 for abs in sorted(toprint):
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1260 if abs in unknownset:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1261 status = _(b'adding %s\n') % abs
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1262 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1263 status = _(b'removing %s\n') % abs
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1264 repo.ui.status(status)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1265
41673 0a5a6675c86c addremove: use uipathfn instead of m.rel() for recorded similatity message Martin von Zweigbergk <martinvonz@google.com> parents: 41663 diff changeset	1266 # TODO: We should probably have the caller pass in uipathfn and apply it to
41708 e21183db2259 scmutil: fix a comment that doesn't match the code Martin von Zweigbergk <martinvonz@google.com> parents: 41696 diff changeset	1267 # the messages above too. legacyrelativevalue=True is consistent with how
41673 0a5a6675c86c addremove: use uipathfn instead of m.rel() for recorded similatity message Martin von Zweigbergk <martinvonz@google.com> parents: 41663 diff changeset	1268 # it used to work.
41696 b81ecf3571d5 addremove: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41695 diff changeset	1269 uipathfn = getuipathfn(repo, legacyrelativevalue=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1270 renames = _findrenames(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1271 repo, m, added + unknown, removed + deleted, similarity, uipathfn
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1272 )
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1273
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1274 _markchanges(repo, unknown + forgotten, deleted, renames)
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1275
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1276 for f in rejected:
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1277 if f in m.files():
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1278 return 1
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1279 return 0
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1280
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1281
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1282 def _interestingfiles(repo, matcher):
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1283 '''Walk dirstate with matcher, looking for files that addremove would care
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1284 about.
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1285
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1286 This is different from dirstate.status because it doesn't care about
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1287 whether files are modified or clean.'''
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1288 added, unknown, deleted, removed, forgotten = [], [], [], [], []
33647 377e8ddaebef pathauditor: disable cache of audited paths by default (issue5628) Yuya Nishihara <yuya@tcha.org> parents: 33542 diff changeset	1289 audit_path = pathutil.pathauditor(repo.root, cached=True)
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1290
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1291 ctx = repo[None]
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1292 dirstate = repo.dirstate
40088 1d09ba0d2ed3 narrow: move remaining narrow-limited dirstate walks to core Martin von Zweigbergk <martinvonz@google.com> parents: 40042 diff changeset	1293 matcher = repo.narrowmatch(matcher, includeexact=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1294 walkresults = dirstate.walk(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1295 matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1296 subrepos=sorted(ctx.substate),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1297 unknown=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1298 ignored=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1299 full=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1300 )
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	1301 for abs, st in pycompat.iteritems(walkresults):
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1302 dstate = dirstate[abs]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1303 if dstate == b'?' and audit_path.check(abs):
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1304 unknown.append(abs)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1305 elif dstate != b'r' and not st:
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1306 deleted.append(abs)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1307 elif dstate == b'r' and st:
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1308 forgotten.append(abs)
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1309 # for finding renames
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1310 elif dstate == b'r' and not st:
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1311 removed.append(abs)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1312 elif dstate == b'a':
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1313 added.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1314
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1315 return added, unknown, deleted, removed, forgotten
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1316
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1317
41673 0a5a6675c86c addremove: use uipathfn instead of m.rel() for recorded similatity message Martin von Zweigbergk <martinvonz@google.com> parents: 41663 diff changeset	1318 def _findrenames(repo, matcher, added, removed, similarity, uipathfn):
19152 7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1319 '''Find renames from removed files to added ones.'''
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1320 renames = {}
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1321 if similarity > 0:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1322 for old, new, score in similar.findrenames(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1323 repo, added, removed, similarity
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1324 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1325 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1326 repo.ui.verbose
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1327 or not matcher.exact(old)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1328 or not matcher.exact(new)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1329 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1330 repo.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1331 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1332 b'recording removal of %s as rename to %s '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1333 b'(%d%% similar)\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1334 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1335 % (uipathfn(old), uipathfn(new), score * 100)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1336 )
19152 7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1337 renames[new] = old
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1338 return renames
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1339
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1340
19153 9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1341 def _markchanges(repo, unknown, deleted, renames):
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1342 '''Marks the files in unknown as added, the files in deleted as removed,
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1343 and the files in renames as copied.'''
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1344 wctx = repo[None]
27851 4133a306606c with: use context manager in _markchanges Bryan O'Sullivan <bryano@fb.com> parents: 27706 diff changeset	1345 with repo.wlock():
19153 9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1346 wctx.forget(deleted)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1347 wctx.add(unknown)
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	1348 for new, old in pycompat.iteritems(renames):
19153 9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1349 wctx.copy(old, new)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1350
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1351
41790 e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1352 def getrenamedfn(repo, endrev=None):
42115 27475ae67676 copies: extract function for deciding whether to use changeset-centric algos Martin von Zweigbergk <martinvonz@google.com> parents: 42114 diff changeset	1353 if copiesmod.usechangesetcentricalgo(repo):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1354
42114 aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1355 def getrenamed(fn, rev):
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1356 ctx = repo[rev]
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1357 p1copies = ctx.p1copies()
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1358 if fn in p1copies:
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1359 return p1copies[fn]
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1360 p2copies = ctx.p2copies()
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1361 if fn in p2copies:
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1362 return p2copies[fn]
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1363 return None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1364
42114 aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1365 return getrenamed
aa84bc48c2f7 getrenamedfn: get copy data from context object if configured Martin von Zweigbergk <martinvonz@google.com> parents: 41943 diff changeset	1366
41790 e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1367 rcache = {}
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1368 if endrev is None:
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1369 endrev = len(repo)
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1370
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1371 def getrenamed(fn, rev):
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1372 '''looks up all renames for a file (up to endrev) the first
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1373 time the file is given. It indexes on the changerev and only
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1374 parses the manifest if linkrev != changerev.
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1375 Returns rename info for fn at changerev rev.'''
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1376 if fn not in rcache:
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1377 rcache[fn] = {}
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1378 fl = repo.file(fn)
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1379 for i in fl:
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1380 lr = fl.linkrev(i)
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1381 renamed = fl.renamed(fl.node(i))
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1382 rcache[fn][lr] = renamed and renamed[0]
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1383 if lr >= endrev:
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1384 break
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1385 if rev in rcache[fn]:
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1386 return rcache[fn][rev]
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1387
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1388 # If linkrev != rev (i.e. rev not found in rcache) fallback to
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1389 # filectx logic.
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1390 try:
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1391 return repo[rev][fn].copysource()
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1392 except error.LookupError:
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1393 return None
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1394
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1395 return getrenamed
e9b9ee9af4a9 templatekw: move getrenamedfn() to scmutil (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41708 diff changeset	1396
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1397
42518 88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1398 def getcopiesfn(repo, endrev=None):
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1399 if copiesmod.usechangesetcentricalgo(repo):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1400
42518 88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1401 def copiesfn(ctx):
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1402 if ctx.p2copies():
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1403 allcopies = ctx.p1copies().copy()
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1404 # There should be no overlap
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1405 allcopies.update(ctx.p2copies())
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1406 return sorted(allcopies.items())
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1407 else:
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1408 return sorted(ctx.p1copies().items())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1409
42518 88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1410 else:
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1411 getrenamed = getrenamedfn(repo, endrev)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1412
42518 88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1413 def copiesfn(ctx):
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1414 copies = []
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1415 for fn in ctx.files():
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1416 rename = getrenamed(fn, ctx.rev())
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1417 if rename:
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1418 copies.append((fn, rename))
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1419 return copies
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1420
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1421 return copiesfn
88ba0ff94605 copies: create helper for getting all copies for changeset Martin von Zweigbergk <martinvonz@google.com> parents: 42115 diff changeset	1422
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1423
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1424 def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1425 """Update the dirstate to reflect the intent of copying src to dst. For
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1426 different reasons it might not end with dst being marked as copied from src.
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1427 """
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1428 origsrc = repo.dirstate.copied(src) or src
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1429 if dst == origsrc: # copying back a copy?
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1430 if repo.dirstate[dst] not in b'mn' and not dryrun:
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1431 repo.dirstate.normallookup(dst)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1432 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1433 if repo.dirstate[origsrc] == b'a' and origsrc == src:
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1434 if not ui.quiet:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1435 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1436 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1437 b"%s has not been committed yet, so no copy "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1438 b"data will be stored for %s.\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1439 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1440 % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1441 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1442 if repo.dirstate[dst] in b'?r' and not dryrun:
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1443 wctx.add([dst])
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1444 elif not dryrun:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1445 wctx.copy(origsrc, dst)
14482 58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	1446
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1447
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1448 def movedirstate(repo, newctx, match=None):
41943 ad4a3e2eedb3 scmutil: document matcher argument of movedirstate() Martin von Zweigbergk <martinvonz@google.com> parents: 41942 diff changeset	1449 """Move the dirstate to newctx and adjust it as necessary.
ad4a3e2eedb3 scmutil: document matcher argument of movedirstate() Martin von Zweigbergk <martinvonz@google.com> parents: 41942 diff changeset	1450
ad4a3e2eedb3 scmutil: document matcher argument of movedirstate() Martin von Zweigbergk <martinvonz@google.com> parents: 41942 diff changeset	1451 A matcher can be provided as an optimization. It is probably a bug to pass
ad4a3e2eedb3 scmutil: document matcher argument of movedirstate() Martin von Zweigbergk <martinvonz@google.com> parents: 41942 diff changeset	1452 a matcher that doesn't match all the differences between the parent of the
ad4a3e2eedb3 scmutil: document matcher argument of movedirstate() Martin von Zweigbergk <martinvonz@google.com> parents: 41942 diff changeset	1453 working copy and newctx.
ad4a3e2eedb3 scmutil: document matcher argument of movedirstate() Martin von Zweigbergk <martinvonz@google.com> parents: 41942 diff changeset	1454 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1455 oldctx = repo[b'.']
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1456 ds = repo.dirstate
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1457 ds.setparents(newctx.node(), nullid)
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1458 copies = dict(ds.copies())
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1459 s = newctx.status(oldctx, match=match)
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1460 for f in s.modified:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1461 if ds[f] == b'r':
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1462 # modified + removed -> removed
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1463 continue
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1464 ds.normallookup(f)
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1465
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1466 for f in s.added:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1467 if ds[f] == b'r':
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1468 # added + removed -> unknown
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1469 ds.drop(f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1470 elif ds[f] != b'a':
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1471 ds.add(f)
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1472
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1473 for f in s.removed:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1474 if ds[f] == b'a':
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1475 # removed + added -> normal
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1476 ds.normallookup(f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1477 elif ds[f] != b'r':
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1478 ds.remove(f)
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1479
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1480 # Merge old parent and old working dir copies
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1481 oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1482 oldcopies.update(copies)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1483 copies = dict(
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	1484 (dst, oldcopies.get(src, src))
d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	1485 for dst, src in pycompat.iteritems(oldcopies)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1486 )
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1487 # Adjust the dirstate copies
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	1488 for dst, src in pycompat.iteritems(copies):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1489 if src not in newctx or dst in newctx or ds[dst] != b'a':
41942 232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1490 src = None
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1491 ds.copy(src, dst)
232d4b9d391a uncommit: move _movedirstate() to scmutil for reuse Martin von Zweigbergk <martinvonz@google.com> parents: 41804 diff changeset	1492
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1493
24934 5abd0a76bc8f requires: move requires file writing func from localrepo to scmutil Drew Gottlieb <drgott@google.com> parents: 24755 diff changeset	1494 def writerequires(opener, requirements):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1495 with opener(b'requires', b'w', atomictemp=True) as fp:
27706 22e362da27cf scmutil: use context managers for file handles Gregory Szorc <gregory.szorc@gmail.com> parents: 27651 diff changeset	1496 for r in sorted(requirements):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1497 fp.write(b"%s\n" % r)
24934 5abd0a76bc8f requires: move requires file writing func from localrepo to scmutil Drew Gottlieb <drgott@google.com> parents: 24755 diff changeset	1498
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1499
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1500 class filecachesubentry(object):
20042 9a72d3886888 scmutil.filecacheentry: make stat argument to constructor mandatory Siddharth Agarwal <sid0@fb.com> parents: 20033 diff changeset	1501 def __init__(self, path, stat):
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1502 self.path = path
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1503 self.cachestat = None
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1504 self._cacheable = None
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1505
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1506 if stat:
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1507 self.cachestat = filecachesubentry.stat(self.path)
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1508
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1509 if self.cachestat:
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1510 self._cacheable = self.cachestat.cacheable()
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1511 else:
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1512 # None means we don't know yet
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1513 self._cacheable = None
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1514
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1515 def refresh(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1516 if self.cacheable():
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1517 self.cachestat = filecachesubentry.stat(self.path)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1518
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1519 def cacheable(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1520 if self._cacheable is not None:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1521 return self._cacheable
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1522
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1523 # we don't know yet, assume it is for now
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1524 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1525
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1526 def changed(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1527 # no point in going further if we can't cache it
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1528 if not self.cacheable():
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1529 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1530
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1531 newstat = filecachesubentry.stat(self.path)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1532
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1533 # we may not know if it's cacheable yet, check again now
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1534 if newstat and self._cacheable is None:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1535 self._cacheable = newstat.cacheable()
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1536
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1537 # check again
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1538 if not self._cacheable:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1539 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1540
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1541 if self.cachestat != newstat:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1542 self.cachestat = newstat
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1543 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1544 else:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1545 return False
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1546
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1547 @staticmethod
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1548 def stat(path):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1549 try:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1550 return util.cachestat(path)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25658 diff changeset	1551 except OSError as e:
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1552 if e.errno != errno.ENOENT:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1553 raise
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1554
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1555
20044 d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1556 class filecacheentry(object):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1557 def __init__(self, paths, stat=True):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1558 self._entries = []
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1559 for path in paths:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1560 self._entries.append(filecachesubentry(path, stat))
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1561
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1562 def changed(self):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1563 '''true if any entry has changed'''
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1564 for entry in self._entries:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1565 if entry.changed():
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1566 return True
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1567 return False
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1568
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1569 def refresh(self):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1570 for entry in self._entries:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1571 entry.refresh()
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1572
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1573
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1574 class filecache(object):
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1575 """A property like decorator that tracks files under .hg/ for updates.
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1576
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1577 On first access, the files defined as arguments are stat()ed and the
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1578 results cached. The decorated function is called. The results are stashed
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1579 away in a ``_filecache`` dict on the object whose method is decorated.
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1580
40493 7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1581 On subsequent access, the cached result is used as it is set to the
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1582 instance dictionary.
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1583
40493 7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1584 On external property set/delete operations, the caller must update the
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1585 corresponding _filecache entry appropriately. Use __class__.<attr>.set()
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1586 instead of directly setting <attr>.
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1587
40493 7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1588 When using the property API, the cached data is always used if available.
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1589 No stat() is performed to check if the file has changed.
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1590
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1591 Others can muck about with the state of the ``_filecache`` dict. e.g. they
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1592 can populate an entry before the property's getter is called. In this case,
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1593 entries in ``_filecache`` will be used during property operations,
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1594 if available. If the underlying file changes, it is up to external callers
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1595 to reflect this by e.g. calling ``delattr(obj, attr)`` to remove the cached
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1596 method result as well as possibly calling ``del obj._filecache[attr]`` to
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1597 remove the ``filecacheentry``.
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1598 """
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1599
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1600 def __init__(self, *paths):
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1601 self.paths = paths
16198 fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1602
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1603 def join(self, obj, fname):
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1604 """Used to compute the runtime path of a cached file.
16198 fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1605
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1606 Users should subclass filecache and provide their own version of this
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1607 function to call the appropriate join function on 'obj' (an instance
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1608 of the class that its member function was decorated).
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1609 """
31294 1937671105bc filecache: make 'join' abstract Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31227 diff changeset	1610 raise NotImplementedError
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1611
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1612 def __call__(self, func):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1613 self.func = func
37913 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37912 diff changeset	1614 self.sname = func.__name__
73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37912 diff changeset	1615 self.name = pycompat.sysbytes(self.sname)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1616 return self
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1617
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1618 def __get__(self, obj, type=None):
29373 36fbd72c2f39 scmutil: allow access to filecache descriptor on class Martijn Pieters <mjpieters@fb.com> parents: 29367 diff changeset	1619 # if accessed on the class, return the descriptor itself.
36fbd72c2f39 scmutil: allow access to filecache descriptor on class Martijn Pieters <mjpieters@fb.com> parents: 29367 diff changeset	1620 if obj is None:
36fbd72c2f39 scmutil: allow access to filecache descriptor on class Martijn Pieters <mjpieters@fb.com> parents: 29367 diff changeset	1621 return self
40493 7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1622
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1623 assert self.sname not in obj.__dict__
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1624
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1625 entry = obj._filecache.get(self.name)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1626
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1627 if entry:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1628 if entry.changed():
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1629 entry.obj = self.func(obj)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1630 else:
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1631 paths = [self.join(obj, path) for path in self.paths]
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1632
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1633 # We stat -before- creating the object so our cache doesn't lie if
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1634 # a writer modified between the time we read and stat
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1635 entry = filecacheentry(paths, True)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1636 entry.obj = self.func(obj)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1637
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1638 obj._filecache[self.name] = entry
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1639
37913 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37912 diff changeset	1640 obj.__dict__[self.sname] = entry.obj
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1641 return entry.obj
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1642
40493 7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1643 # don't implement __set__(), which would make __dict__ lookup as slow as
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1644 # function call.
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1645
7caf632e30c3 filecache: unimplement __set__() and __delete__() (API) Yuya Nishihara <yuya@tcha.org> parents: 40492 diff changeset	1646 def set(self, obj, value):
18316 f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1647 if self.name not in obj._filecache:
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1648 # we add an entry for the missing value because X in __dict__
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1649 # implies X in _filecache
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1650 paths = [self.join(obj, path) for path in self.paths]
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1651 ce = filecacheentry(paths, False)
18316 f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1652 obj._filecache[self.name] = ce
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1653 else:
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1654 ce = obj._filecache[self.name]
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1655
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1656 ce.obj = value # update cached copy
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1657 obj.__dict__[self.sname] = value # update copy returned by obj.x
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1658
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1659
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1660 def extdatasource(repo, source):
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1661 """Gather a map of rev -> value dict from the specified source
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1662
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1663 A source spec is treated as a URL, with a special case shell: type
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1664 for parsing the output from a shell command.
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1665
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1666 The data is parsed as a series of newline-separated records where
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1667 each record is a revision specifier optionally followed by a space
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1668 and a freeform string value. If the revision is known locally, it
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1669 is converted to a rev, otherwise the record is skipped.
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1670
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1671 Note that both key and value are treated as UTF-8 and converted to
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1672 the local encoding. This allows uniformity between local and
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1673 remote data sources.
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1674 """
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1675
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1676 spec = repo.ui.config(b"extdata", source)
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1677 if not spec:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1678 raise error.Abort(_(b"unknown extdata source '%s'") % source)
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1679
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1680 data = {}
34462 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1681 src = proc = None
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1682 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1683 if spec.startswith(b"shell:"):
34462 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1684 # external commands should be run relative to the repo root
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1685 cmd = spec[6:]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1686 proc = subprocess.Popen(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1687 procutil.tonativestr(cmd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1688 shell=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1689 bufsize=-1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1690 close_fds=procutil.closefds,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1691 stdout=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1692 cwd=procutil.tonativestr(repo.root),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1693 )
34462 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1694 src = proc.stdout
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1695 else:
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1696 # treat as a URL or file
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1697 src = url.open(repo.ui, spec)
34461 910adadf08e8 extdata: just use iterator to read lines one by one Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1698 for l in src:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1699 if b" " in l:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1700 k, v = l.strip().split(b" ", 1)
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1701 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1702 k, v = l.strip(), b""
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1703
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1704 k = encoding.tolocal(k)
34460 d5c5cc767b7e extdata: ignore ambiguous identifier as well Yuya Nishihara <yuya@tcha.org> parents: 34457 diff changeset	1705 try:
37360 d0d55980ffa7 extdatasource: use revsymbol() for converting to node Martin von Zweigbergk <martinvonz@google.com> parents: 37350 diff changeset	1706 data[revsingle(repo, k).rev()] = encoding.tolocal(v)
34460 d5c5cc767b7e extdata: ignore ambiguous identifier as well Yuya Nishihara <yuya@tcha.org> parents: 34457 diff changeset	1707 except (error.LookupError, error.RepoLookupError):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1708 pass # we ignore data for nodes that don't exist locally
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1709 finally:
34462 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1710 if proc:
42576 ea6558db1011 extdata: avoid crashing inside subprocess when we get a revset parse error Augie Fackler <augie@google.com> parents: 42518 diff changeset	1711 try:
ea6558db1011 extdata: avoid crashing inside subprocess when we get a revset parse error Augie Fackler <augie@google.com> parents: 42518 diff changeset	1712 proc.communicate()
ea6558db1011 extdata: avoid crashing inside subprocess when we get a revset parse error Augie Fackler <augie@google.com> parents: 42518 diff changeset	1713 except ValueError:
ea6558db1011 extdata: avoid crashing inside subprocess when we get a revset parse error Augie Fackler <augie@google.com> parents: 42518 diff changeset	1714 # This happens if we started iterating src and then
ea6558db1011 extdata: avoid crashing inside subprocess when we get a revset parse error Augie Fackler <augie@google.com> parents: 42518 diff changeset	1715 # get a parse error on a line. It should be safe to ignore.
ea6558db1011 extdata: avoid crashing inside subprocess when we get a revset parse error Augie Fackler <augie@google.com> parents: 42518 diff changeset	1716 pass
34462 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1717 if src:
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34461 diff changeset	1718 src.close()
35419 b1959391a088 extdata: abort if external command exits with non-zero status (BC) Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	1719 if proc and proc.returncode != 0:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1720 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1721 _(b"extdata command '%s' failed: %s")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1722 % (cmd, procutil.explainexit(proc.returncode))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1723 )
34457 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1724
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1725 return data
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34368 diff changeset	1726
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1727
26490 f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1728 def _locksub(repo, lock, envvar, cmd, environ=None, args, *kwargs):
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1729 if lock is None:
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1730 raise error.LockInheritanceContractViolation(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1731 b'lock can only be inherited while held'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1732 )
26490 f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1733 if environ is None:
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1734 environ = {}
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1735 with lock.inherit() as locker:
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1736 environ[envvar] = locker
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1737 return repo.ui.system(cmd, environ=environ, args, *kwargs)
26491 366d489295ca scmutil: add a way for a repo's wlock to be inherited by a subprocess Siddharth Agarwal <sid0@fb.com> parents: 26490 diff changeset	1738
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1739
26491 366d489295ca scmutil: add a way for a repo's wlock to be inherited by a subprocess Siddharth Agarwal <sid0@fb.com> parents: 26490 diff changeset	1740 def wlocksub(repo, cmd, args, *kwargs):
366d489295ca scmutil: add a way for a repo's wlock to be inherited by a subprocess Siddharth Agarwal <sid0@fb.com> parents: 26490 diff changeset	1741 """run cmd as a subprocess that allows inheriting repo's wlock
366d489295ca scmutil: add a way for a repo's wlock to be inherited by a subprocess Siddharth Agarwal <sid0@fb.com> parents: 26490 diff changeset	1742
366d489295ca scmutil: add a way for a repo's wlock to be inherited by a subprocess Siddharth Agarwal <sid0@fb.com> parents: 26490 diff changeset	1743 This can only be called while the wlock is held. This takes all the
366d489295ca scmutil: add a way for a repo's wlock to be inherited by a subprocess Siddharth Agarwal <sid0@fb.com> parents: 26490 diff changeset	1744 arguments that ui.system does, and returns the exit code of the
366d489295ca scmutil: add a way for a repo's wlock to be inherited by a subprocess Siddharth Agarwal <sid0@fb.com> parents: 26490 diff changeset	1745 subprocess."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1746 return _locksub(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1747 repo, repo.currentwlock(), b'HG_WLOCK_LOCKER', cmd, args, *kwargs
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1748 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1749
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1750
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1751 class progress(object):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1752 def __init__(self, ui, updatebar, topic, unit=b"", total=None):
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1753 self.ui = ui
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1754 self.pos = 0
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1755 self.topic = topic
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1756 self.unit = unit
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1757 self.total = total
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1758 self.debug = ui.configbool(b'progress', b'debug')
41146 963462786f6e progress: check what type of progress bar to use only once per topic Martin von Zweigbergk <martinvonz@google.com> parents: 41145 diff changeset	1759 self._updatebar = updatebar
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1760
38380 800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38379 diff changeset	1761 def __enter__(self):
38507 077301ac69dc scmutil: fix __enter__ in progress context manager Danny Hooper <hooper@google.com> parents: 38460 diff changeset	1762 return self
38380 800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38379 diff changeset	1763
800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38379 diff changeset	1764 def __exit__(self, exc_type, exc_value, exc_tb):
800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38379 diff changeset	1765 self.complete()
800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38379 diff changeset	1766
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1767 def update(self, pos, item=b"", total=None):
38425 6dea017eb6ba progress: enforce use of complete() on the helper class Martin von Zweigbergk <martinvonz@google.com> parents: 38380 diff changeset	1768 assert pos is not None
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1769 if total:
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1770 self.total = total
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1771 self.pos = pos
41209 b223fc1c6b4c progress: change _updatebar() to take parameters as arguments Yuya Nishihara <yuya@tcha.org> parents: 41146 diff changeset	1772 self._updatebar(self.topic, self.pos, item, self.unit, self.total)
41145 3025fd3c2e71 progress: split up _print() method in bar-updating and debug-printing Martin von Zweigbergk <martinvonz@google.com> parents: 41144 diff changeset	1773 if self.debug:
3025fd3c2e71 progress: split up _print() method in bar-updating and debug-printing Martin von Zweigbergk <martinvonz@google.com> parents: 41144 diff changeset	1774 self._printdebug(item)
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1775
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1776 def increment(self, step=1, item=b"", total=None):
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1777 self.update(self.pos + step, item, total)
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1778
38379 ef692614e601 progress: hide update(None) in a new complete() method Martin von Zweigbergk <martinvonz@google.com> parents: 38351 diff changeset	1779 def complete(self):
41143 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1780 self.pos = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1781 self.unit = b""
41143 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1782 self.total = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1783 self._updatebar(self.topic, self.pos, b"", self.unit, self.total)
38379 ef692614e601 progress: hide update(None) in a new complete() method Martin von Zweigbergk <martinvonz@google.com> parents: 38351 diff changeset	1784
41145 3025fd3c2e71 progress: split up _print() method in bar-updating and debug-printing Martin von Zweigbergk <martinvonz@google.com> parents: 41144 diff changeset	1785 def _printdebug(self, item):
41143 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1786 if self.unit:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1787 unit = b' ' + self.unit
41143 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1788 if item:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1789 item = b' ' + item
41143 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1790
8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1791 if self.total:
8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1792 pct = 100.0 * self.pos / self.total
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1793 self.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1794 b'%s:%s %d/%d%s (%4.2f%%)\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1795 % (self.topic, item, self.pos, self.total, unit, pct)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1796 )
41143 8cf92ca92bfe progress: write ui.progress() in terms of ui.makeprogress() Martin von Zweigbergk <martinvonz@google.com> parents: 40902 diff changeset	1797 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1798 self.ui.debug(b'%s:%s %d%s\n' % (self.topic, item, self.pos, unit))
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38340 diff changeset	1799
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1800
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1801 def gdinitconfig(ui):
e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1802 """helper function to know if a repo should be created as general delta
26907 dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1803 """
dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1804 # experimental config: format.generaldelta
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1805 return ui.configbool(b'format', b'generaldelta') or ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1806 b'format', b'usegeneraldelta'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1807 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1808
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1809
26907 dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1810 def gddeltaconfig(ui):
dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1811 """helper function to know if incoming delta should be optimised
dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1812 """
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1813 # experimental config: format.generaldelta
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1814 return ui.configbool(b'format', b'generaldelta')
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1815
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1816
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1817 class simplekeyvaluefile(object):
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1818 """A simple file with key=value lines
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1819
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1820 Keys must be alphanumerics and start with a letter, values must not
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1821 contain '\n' characters"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1822
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1823 firstlinekey = b'__firstline'
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1824
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1825 def __init__(self, vfs, path, keys=None):
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1826 self.vfs = vfs
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1827 self.path = path
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1828
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1829 def read(self, firstlinenonkeyval=False):
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1830 """Read the contents of a simple key-value file
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1831
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1832 'firstlinenonkeyval' indicates whether the first line of file should
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1833 be treated as a key-value pair or reuturned fully under the
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1834 __firstline key."""
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1835 lines = self.vfs.readlines(self.path)
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1836 d = {}
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1837 if firstlinenonkeyval:
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1838 if not lines:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1839 e = _(b"empty simplekeyvalue file")
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1840 raise error.CorruptedState(e)
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1841 # we don't want to include '\n' in the __firstline
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1842 d[self.firstlinekey] = lines[0][:-1]
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1843 del lines[0]
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1844
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1845 try:
32309 ed2c44741190 scmutil: add simplekeyvaluefile reading test Kostia Balytskyi <ikostia@fb.com> parents: 32221 diff changeset	1846 # the 'if line.strip()' part prevents us from failing on empty
ed2c44741190 scmutil: add simplekeyvaluefile reading test Kostia Balytskyi <ikostia@fb.com> parents: 32221 diff changeset	1847 # lines which only contain '\n' therefore are not skipped
ed2c44741190 scmutil: add simplekeyvaluefile reading test Kostia Balytskyi <ikostia@fb.com> parents: 32221 diff changeset	1848 # by 'if line'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1849 updatedict = dict(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1850 line[:-1].split(b'=', 1) for line in lines if line.strip()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1851 )
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1852 if self.firstlinekey in updatedict:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1853 e = _(b"%r can't be used as a key")
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1854 raise error.CorruptedState(e % self.firstlinekey)
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1855 d.update(updatedict)
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1856 except ValueError as e:
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1857 raise error.CorruptedState(str(e))
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1858 return d
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1859
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1860 def write(self, data, firstline=None):
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1861 """Write key=>value mapping to a file
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1862 data is a dict. Keys must be alphanumerical and start with a letter.
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1863 Values must not contain newline characters.
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1864
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1865 If 'firstline' is not None, it is written to file before
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1866 everything else, as it is, not in a key=value form"""
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1867 lines = []
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1868 if firstline is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1869 lines.append(b'%s\n' % firstline)
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1870
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1871 for k, v in data.items():
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1872 if k == self.firstlinekey:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1873 e = b"key name '%s' is reserved" % self.firstlinekey
32310 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32309 diff changeset	1874 raise error.ProgrammingError(e)
35953 558e01a23f40 py3: slice on bytes to prevent getting the ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 35928 diff changeset	1875 if not k[0:1].isalpha():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1876 e = b"keys must start with a letter in a key-value file"
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1877 raise error.ProgrammingError(e)
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1878 if not k.isalnum():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1879 e = b"invalid key name in a simple key-value file"
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1880 raise error.ProgrammingError(e)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1881 if b'\n' in v:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1882 e = b"invalid value in a simple key-value file"
31559 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31428 diff changeset	1883 raise error.ProgrammingError(e)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1884 lines.append(b"%s=%s\n" % (k, v))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1885 with self.vfs(self.path, mode=b'wb', atomictemp=True) as fp:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1886 fp.write(b''.join(lines))
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33246 diff changeset	1887
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1888
33541 b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1889 _reportobsoletedsource = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1890 b'debugobsolete',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1891 b'pull',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1892 b'push',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1893 b'serve',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1894 b'unbundle',
33541 b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1895 ]
b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1896
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1897 _reportnewcssource = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1898 b'pull',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1899 b'unbundle',
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1900 ]
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1901
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1902
37762 7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1903 def prefetchfiles(repo, revs, match):
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1904 """Invokes the registered file prefetch functions, allowing extensions to
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1905 ensure the corresponding files are available locally, before the command
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1906 uses them."""
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1907 if match:
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1908 # The command itself will complain about files that don't exist, so
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1909 # don't duplicate the message.
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1910 match = matchmod.badmatch(match, lambda fn, msg: None)
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1911 else:
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1912 match = matchall(repo)
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1913
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1914 fileprefetchhooks(repo, revs, match)
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1915
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1916
37762 7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1917 # a list of (repo, revs, match) prefetch functions
36175 f52a9336ac5f cmdutil: convert the prefetchfiles() hook to a callback mechanism (API) Matt Harbison <matt_harbison@yahoo.com> parents: 35953 diff changeset	1918 fileprefetchhooks = util.hooks()
f52a9336ac5f cmdutil: convert the prefetchfiles() hook to a callback mechanism (API) Matt Harbison <matt_harbison@yahoo.com> parents: 35953 diff changeset	1919
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1920 # A marker that tells the evolve extension to suppress its own reporting
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1921 _reportstroubledchangesets = True
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1922
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1923
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1924 def registersummarycallback(repo, otr, txnname=b''):
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33246 diff changeset	1925 """register a callback to issue a summary after the transaction is closed
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33246 diff changeset	1926 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1927
34619 18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1928 def txmatch(sources):
18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1929 return any(txnname.startswith(source) for source in sources)
18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1930
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1931 categories = []
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1932
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1933 def reportsummary(func):
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1934 """decorator for report callbacks."""
34987 96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1935 # The repoview life cycle is shorter than the one of the actual
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1936 # underlying repository. So the filtered object can die before the
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1937 # weakref is used leading to troubles. We keep a reference to the
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1938 # unfiltered object and restore the filtering when retrieving the
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1939 # repository through the weakref.
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1940 filtername = repo.filtername
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1941 reporef = weakref.ref(repo.unfiltered())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1942
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1943 def wrapped(tr):
34619 18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1944 repo = reporef()
34987 96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1945 if filtername:
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 34972 diff changeset	1946 repo = repo.filtered(filtername)
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1947 func(repo, tr)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1948
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1949 newcat = b'%02i-txnreport' % len(categories)
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1950 otr.addpostclose(newcat, wrapped)
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1951 categories.append(newcat)
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1952 return wrapped
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1953
42903 d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42900 diff changeset	1954 @reportsummary
d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42900 diff changeset	1955 def reportchangegroup(repo, tr):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1956 cgchangesets = tr.changes.get(b'changegroup-count-changesets', 0)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1957 cgrevisions = tr.changes.get(b'changegroup-count-revisions', 0)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1958 cgfiles = tr.changes.get(b'changegroup-count-files', 0)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1959 cgheads = tr.changes.get(b'changegroup-count-heads', 0)
42903 d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42900 diff changeset	1960 if cgchangesets or cgrevisions or cgfiles:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1961 htext = b""
42903 d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42900 diff changeset	1962 if cgheads:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1963 htext = _(b" (%+d heads)") % cgheads
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1964 msg = _(b"added %d changesets with %d changes to %d files%s\n")
42903 d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42900 diff changeset	1965 repo.ui.status(msg % (cgchangesets, cgrevisions, cgfiles, htext))
d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42900 diff changeset	1966
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1967 if txmatch(_reportobsoletedsource):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1968
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1969 @reportsummary
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1970 def reportobsoleted(repo, tr):
34619 18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1971 obsoleted = obsutil.getobsoleted(repo, tr)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1972 newmarkers = len(tr.changes.get(b'obsmarkers', ()))
42900 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42731 diff changeset	1973 if newmarkers:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1974 repo.ui.status(_(b'%i new obsolescence markers\n') % newmarkers)
34619 18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1975 if obsoleted:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1976 repo.ui.status(_(b'obsoleted %i changesets\n') % len(obsoleted))
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1977
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1978 if obsolete.isenabled(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1979 repo, obsolete.createmarkersopt
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1980 ) and repo.ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1981 b'experimental', b'evolution.report-instabilities'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1982 ):
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1983 instabilitytypes = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1984 (b'orphan', b'orphan'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1985 (b'phase-divergent', b'phasedivergent'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1986 (b'content-divergent', b'contentdivergent'),
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1987 ]
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1988
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1989 def getinstabilitycounts(repo):
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1990 filtered = repo.changelog.filteredrevs
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1991 counts = {}
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1992 for instability, revset in instabilitytypes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1993 counts[instability] = len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1994 set(obsolete.getrevs(repo, revset)) - filtered
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1995 )
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1996 return counts
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1997
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	1998 oldinstabilitycounts = getinstabilitycounts(repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	1999
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	2000 @reportsummary
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	2001 def reportnewinstabilities(repo, tr):
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	2002 newinstabilitycounts = getinstabilitycounts(repo)
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	2003 for instability, revset in instabilitytypes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2004 delta = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2005 newinstabilitycounts[instability]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2006 - oldinstabilitycounts[instability]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2007 )
38460 1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2008 msg = getinstabilitymessage(delta, instability)
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2009 if msg:
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2010 repo.ui.warn(msg)
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35503 diff changeset	2011
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	2012 if txmatch(_reportnewcssource):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2013
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	2014 @reportsummary
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	2015 def reportnewcs(repo, tr):
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	2016 """Report the range of new revisions pulled/unbundled."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2017 origrepolen = tr.changes.get(b'origrepolen', len(repo))
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2018 unfi = repo.unfiltered()
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2019 if origrepolen >= len(unfi):
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	2020 return
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	2021
39902 a477679f6323 pullreport: skip filtered revs instead of obsolete ones Boris Feld <boris.feld@octobus.net> parents: 39899 diff changeset	2022 # Compute the bounds of new visible revisions' range.
a477679f6323 pullreport: skip filtered revs instead of obsolete ones Boris Feld <boris.feld@octobus.net> parents: 39899 diff changeset	2023 revs = smartset.spanset(repo, start=origrepolen)
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2024 if revs:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2025 minrev, maxrev = repo[revs.min()], repo[revs.max()]
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	2026
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2027 if minrev == maxrev:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2028 revrange = minrev
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2029 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2030 revrange = b'%s:%s' % (minrev, maxrev)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2031 draft = len(repo.revs(b'%ld and draft()', revs))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2032 secret = len(repo.revs(b'%ld and secret()', revs))
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2033 if not (draft or secret):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2034 msg = _(b'new changesets %s\n') % revrange
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2035 elif draft and secret:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2036 msg = _(b'new changesets %s (%d drafts, %d secrets)\n')
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2037 msg %= (revrange, draft, secret)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2038 elif draft:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2039 msg = _(b'new changesets %s (%d drafts)\n')
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2040 msg %= (revrange, draft)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2041 elif secret:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2042 msg = _(b'new changesets %s (%d secrets)\n')
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2043 msg %= (revrange, secret)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2044 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2045 errormsg = b'entered unreachable condition'
39903 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2046 raise error.ProgrammingError(errormsg)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39902 diff changeset	2047 repo.ui.status(msg)
35188 9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 34987 diff changeset	2048
39904 f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2049 # search new changesets directly pulled as obsolete
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2050 duplicates = tr.changes.get(b'revduplicates', ())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2051 obsadded = unfi.revs(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2052 b'(%d: + %ld) and obsolete()', origrepolen, duplicates
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2053 )
39904 f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2054 cl = repo.changelog
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2055 extinctadded = [r for r in obsadded if r not in cl]
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2056 if extinctadded:
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2057 # They are not just obsolete, but obsolete and invisible
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2058 # we call them "extinct" internally but the terms have not been
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2059 # exposed to users.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2060 msg = b'(%d other changesets obsolete on arrival)\n'
39904 f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2061 repo.ui.status(msg % len(extinctadded))
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39903 diff changeset	2062
38204 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2063 @reportsummary
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2064 def reportphasechanges(repo, tr):
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2065 """Report statistics of phase changes for changesets pre-existing
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2066 pull/unbundle.
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2067 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2068 origrepolen = tr.changes.get(b'origrepolen', len(repo))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2069 phasetracking = tr.changes.get(b'phases', {})
38204 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2070 if not phasetracking:
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2071 return
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2072 published = [
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2073 rev
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	2074 for rev, (old, new) in pycompat.iteritems(phasetracking)
39328 5763216ba311 transaction: remember original len(repo) instead of tracking added revs (API) Yuya Nishihara <yuya@tcha.org> parents: 39292 diff changeset	2075 if new == phases.public and rev < origrepolen
38204 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2076 ]
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2077 if not published:
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2078 return
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2079 repo.ui.status(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2080 _(b'%d local changesets published\n') % len(published)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2081 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2082
38204 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38164 diff changeset	2083
38460 1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2084 def getinstabilitymessage(delta, instability):
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2085 """function to return the message to show warning about new instabilities
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2086
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2087 exists as a separate function so that extension can wrap to show more
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2088 information like how to fix instabilities"""
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2089 if delta > 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2090 return _(b'%i new %s changesets\n') % (delta, instability)
38460 1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38437 diff changeset	2091
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2092
35195 bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35188 diff changeset	2093 def nodesummaries(repo, nodes, maxnumnodes=4):
bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35188 diff changeset	2094 if len(nodes) <= maxnumnodes or repo.ui.verbose:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2095 return b' '.join(short(h) for h in nodes)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2096 first = b' '.join(short(h) for h in nodes[:maxnumnodes])
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2097 return _(b"%s and %d others") % (first, len(nodes) - maxnumnodes)
35195 bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35188 diff changeset	2098
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2099
42971 76608f9f27f6 singlehead: introduce special handling of closed heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42930 diff changeset	2100 def enforcesinglehead(repo, tr, desc, accountclosed=False):
35196 66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2101 """check that no named branch has multiple heads"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2102 if desc in (b'strip', b'repair'):
35196 66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2103 # skip the logic during strip
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2104 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2105 visible = repo.filtered(b'visible')
35196 66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2106 # possible improvement: we could restrict the check to affected branch
42971 76608f9f27f6 singlehead: introduce special handling of closed heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42930 diff changeset	2107 bm = visible.branchmap()
76608f9f27f6 singlehead: introduce special handling of closed heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42930 diff changeset	2108 for name in bm:
76608f9f27f6 singlehead: introduce special handling of closed heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42930 diff changeset	2109 heads = bm.branchheads(name, closed=accountclosed)
35196 66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2110 if len(heads) > 1:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2111 msg = _(b'rejecting multiple heads on branch "%s"')
35196 66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2112 msg %= name
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2113 hint = _(b'%d heads: %s')
35196 66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2114 hint %= (len(heads), nodesummaries(repo, heads))
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2115 raise error.Abort(msg, hint=hint)
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35195 diff changeset	2116
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2117
35188 9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 34987 diff changeset	2118 def wrapconvertsink(sink):
9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 34987 diff changeset	2119 """Allow extensions to wrap the sink returned by convcmd.convertsink()
9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 34987 diff changeset	2120 before it is used, whether or not the convert extension was formally loaded.
9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 34987 diff changeset	2121 """
9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 34987 diff changeset	2122 return sink
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2123
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2124
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2125 def unhidehashlikerevs(repo, specs, hiddentype):
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2126 """parse the user specs and unhide changesets whose hash or revision number
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2127 is passed.
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2128
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2129 hiddentype can be: 1) 'warn': warn while unhiding changesets
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2130 2) 'nowarn': don't warn while unhiding changesets
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2131
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2132 returns a repo object with the required changesets unhidden
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2133 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2134 if not repo.filtername or not repo.ui.configbool(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2135 b'experimental', b'directaccess'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2136 ):
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2137 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2138
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2139 if repo.filtername not in (b'visible', b'visible-hidden'):
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2140 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2141
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2142 symbols = set()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2143 for spec in specs:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2144 try:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2145 tree = revsetlang.parse(spec)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2146 except error.ParseError: # will be reported by scmutil.revrange()
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2147 continue
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2148
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2149 symbols.update(revsetlang.gethashlikesymbols(tree))
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2150
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2151 if not symbols:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2152 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2153
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2154 revs = _getrevsfromsymbols(repo, symbols)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2155
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2156 if not revs:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2157 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2158
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2159 if hiddentype == b'warn':
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2160 unfi = repo.unfiltered()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2161 revstr = b", ".join([pycompat.bytestr(unfi[l]) for l in revs])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2162 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2163 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2164 b"warning: accessing hidden changesets for write "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2165 b"operation: %s\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2166 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2167 % revstr
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2168 )
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2169
35503 b55a142f00c5 scmutil: use a tuple of possible values instead of using startswith() Pulkit Goyal <7895pulkit@gmail.com> parents: 35500 diff changeset	2170 # we have to use new filtername to separate branch/tags cache until we can
b55a142f00c5 scmutil: use a tuple of possible values instead of using startswith() Pulkit Goyal <7895pulkit@gmail.com> parents: 35500 diff changeset	2171 # disbale these cache when revisions are dynamically pinned.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2172 return repo.filtered(b'visible-hidden', revs)
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2173
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2174
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2175 def _getrevsfromsymbols(repo, symbols):
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2176 """parse the list of symbols and returns a set of revision numbers of hidden
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2177 changesets present in symbols"""
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2178 revs = set()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2179 unfi = repo.unfiltered()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2180 unficl = unfi.changelog
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2181 cl = repo.changelog
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2182 tiprev = len(unficl)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2183 allowrevnums = repo.ui.configbool(b'experimental', b'directaccess.revnums')
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2184 for s in symbols:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2185 try:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2186 n = int(s)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2187 if n <= tiprev:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2188 if not allowrevnums:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2189 continue
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2190 else:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2191 if n not in cl:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2192 revs.add(n)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2193 continue
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2194 except ValueError:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2195 pass
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2196
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2197 try:
37912 69de3c3de036 directaccess: use resolvehexnodeidprefix() instead of _partialmatch() Martin von Zweigbergk <martinvonz@google.com> parents: 37909 diff changeset	2198 s = resolvehexnodeidprefix(unfi, s)
37097 7f025c9b7865 directaccess: do not abort by 'ff...' hash Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	2199 except (error.LookupError, error.WdirUnsupported):
35500 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2200 s = None
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2201
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2202 if s is not None:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2203 rev = unficl.rev(s)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2204 if rev not in cl:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2205 revs.add(rev)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2206
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35419 diff changeset	2207 return revs
38164 46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 38023 diff changeset	2208
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2209
38164 46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 38023 diff changeset	2210 def bookmarkrevs(repo, mark):
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 38023 diff changeset	2211 """
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 38023 diff changeset	2212 Select revisions reachable by a given bookmark
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 38023 diff changeset	2213 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2214 return repo.revs(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2215 b"ancestors(bookmark(%s)) - "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2216 b"ancestors(head() and not bookmark(%s)) - "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2217 b"ancestors(bookmark() and not bookmark(%s))",
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2218 mark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2219 mark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2220 mark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2221 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2222
42730 87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2223
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2224 def computechangesetfilesadded(ctx):
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2225 """return the list of files added in a changeset
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2226 """
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2227 added = []
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2228 for f in ctx.files():
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2229 if not any(f in p for p in ctx.parents()):
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2230 added.append(f)
87c4cd89b539 changectx: extract explicit computechangesetfilesadded method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42576 diff changeset	2231 return added
42731 53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2232
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42971 diff changeset	2233
42731 53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2234 def computechangesetfilesremoved(ctx):
53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2235 """return the list of files removed in a changeset
53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2236 """
53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2237 removed = []
53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2238 for f in ctx.files():
53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2239 if f not in ctx:
53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2240 removed.append(f)
53c07f08fea1 changectx: extract explicit computechangesetfilesremoved method from context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42730 diff changeset	2241 return removed

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/scmutil.py @ 43106:d783f945a701