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

annotate mercurial/scmutil.py @ 39899:f9232b0310ef

pullreport: issue a message about "extinct" pulled changesets Changeset pulled from a remote repository while already obsolete locally can end up hidden after the pull. Hiding obsolete changesets is a good behavior but silently "skipping" some of the pulled content can get confusing. We now detect this situation and emit a message about it. The message is simple and the wording could be improved, however, we focus on the detection here. Evolution is still an experimental feature, so the output is open to changes. In particular, we could point out at the latest successors of the obsolete changesets, however, it can get tricky is there are many of them. So we delay these improvements to another adventure. Another easy improvement would be to merge this message with the previous line about the new nodes and their phases. This is a good example of cases where we can only transmit a limited amount of data to users by default. We need some sort of "transaction journal" we could point the user to.

author	Boris Feld <boris.feld@octobus.net>
date	Thu, 27 Sep 2018 16:52:25 +0200
parents	b5e12039e6e0
children	a89dd6d01df0

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
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	14 import re
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	15 import socket
34461 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 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 _
32658 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 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,
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	22 hex,
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	23 nullid,
39894 d739f423bf06 repo: look up nullrev context by revnum, not symbolic name Martin von Zweigbergk <martinvonz@google.com> parents: 39891 diff changeset	24 nullrev,
34327 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	25 short,
32658 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	26 wdirid,
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	27 wdirrev,
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	28 )
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	29
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	30 from . import (
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	31 encoding,
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	32 error,
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	33 match as matchmod,
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	34 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	35 obsutil,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	36 pathutil,
dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	37 phases,
39226 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	38 policy,
30305 af7c60988f6e py3: make scmutil.rcpath() return bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 30109 diff changeset	39 pycompat,
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 30639 diff changeset	40 revsetlang,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	41 similar,
39897 a477679f6323 pullreport: skip filtered revs instead of obsolete ones Boris Feld <boris.feld@octobus.net> parents: 39894 diff changeset	42 smartset,
34456 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	43 url,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	44 util,
34543 6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	45 vfs,
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	46 )
18690 4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	47
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	48 from .utils import (
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37094 diff changeset	49 procutil,
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	50 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	51 )
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	52
34645 75979c8d4572 codemod: use pycompat.iswindows Jun Wu <quark@fb.com> parents: 34620 diff changeset	53 if pycompat.iswindows:
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	54 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	55 else:
27482 dde3da2246f1 scmutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27093 diff changeset	56 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	57
39226 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	58 parsers = policy.importmod(r'parsers')
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	59
30314 365812902904 scmutil: extend termwidth() to return terminal height, renamed to termsize() Yuya Nishihara <yuya@tcha.org> parents: 30309 diff changeset	60 termsize = scmplatform.termsize
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	61
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	62 class status(tuple):
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	63 '''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	64 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	65 '''
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	66
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	67 __slots__ = ()
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 def __new__(cls, modified, added, removed, deleted, unknown, ignored,
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	70 clean):
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	71 return tuple.__new__(cls, (modified, added, removed, deleted, unknown,
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	72 ignored, clean))
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	73
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	74 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	75 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	76 '''files that have been modified'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	77 return self[0]
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 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	81 '''files that have been added'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	82 return self[1]
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 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	86 '''files that have been removed'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	87 return self[2]
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 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	91 '''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	92 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	93 '''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	94 return self[3]
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	95
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	96 @property
cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	97 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	98 '''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	99 return self[4]
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 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	103 '''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	104 return self[5]
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 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	108 '''files that have not been modified'''
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	109 return self[6]
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 def __repr__(self, args, *kwargs):
37921 a8a7ccec1783 scmutil: fix __repr__ of status tuple Augie Fackler <augie@google.com> parents: 37869 diff changeset	112 return ((r'<status modified=%s, added=%s, removed=%s, deleted=%s, '
a8a7ccec1783 scmutil: fix __repr__ of status tuple Augie Fackler <augie@google.com> parents: 37869 diff changeset	113 r'unknown=%s, ignored=%s, clean=%s>') %
37942 32bc3815efae stringutil: flip the default of pprint() to bprefix=False Yuya Nishihara <yuya@tcha.org> parents: 37921 diff changeset	114 tuple(pycompat.sysstr(stringutil.pprint(v)) for v in self))
22913 cb4449921a1d status: create class for status lists Martin von Zweigbergk <martinvonz@gmail.com> parents: 22816 diff changeset	115
20392 d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	116 def itersubrepos(ctx1, ctx2):
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	117 """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	118 # 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	119 # 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	120 # 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	121 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	122 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	123
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	124 missing = set()
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	125
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	126 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	127 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	128 del subpaths[subpath]
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	129 missing.add(subpath)
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	130
20392 d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	131 for subpath, ctx in sorted(subpaths.iteritems()):
d4f804caa0ed itersubrepos: move to scmutil to break a direct import cycle Augie Fackler <raf@durin42.com> parents: 20364 diff changeset	132 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	133
25418 c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	134 # 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	135 # 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	136 # '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	137 # against itself.
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	138 for subpath in missing:
c0995cd8ff6f scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Matt Harbison <matt_harbison@yahoo.com> parents: 25386 diff changeset	139 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	140
17248 6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	141 def nochangesfound(ui, repo, excluded=None):
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	142 '''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	143 nodes excluded from the push/pull.
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	144 '''
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	145 secretlist = []
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	146 if excluded:
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	147 for n in excluded:
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	148 ctx = repo[n]
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	149 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	150 secretlist.append(n)
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	151
15993 0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	152 if secretlist:
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	153 ui.status(_("no changes found (ignored %d secret changesets)\n")
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	154 % len(secretlist))
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	155 else:
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	156 ui.status(_("no changes found\n"))
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	157
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	158 def callcatch(ui, func):
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	159 """call func() with global exception handling
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	160
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	161 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: 30417 diff changeset	162 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: 30417 diff changeset	163 """
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	164 try:
32041 38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	165 try:
38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	166 return func()
38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	167 except: # re-raises
38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	168 ui.traceback()
38963a53ab0d dispatch: print traceback in scmutil.callcatch() if --traceback specified Yuya Nishihara <yuya@tcha.org> parents: 31951 diff changeset	169 raise
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	170 # Global exception handling, alphabetically
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	171 # Mercurial-specific first, followed by built-in and library exceptions
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	172 except error.LockHeld as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	173 if inst.errno == errno.ETIMEDOUT:
32088 0d892d820a51 lock: avoid unintentional lock acquisition at failure of readlock FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32041 diff changeset	174 reason = _('timed out waiting for lock held by %r') % inst.locker
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	175 else:
32088 0d892d820a51 lock: avoid unintentional lock acquisition at failure of readlock FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32041 diff changeset	176 reason = _('lock held by %r') % inst.locker
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	177 ui.error(_("abort: %s: %s\n") % (
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	178 inst.desc or stringutil.forcebytestr(inst.filename), reason))
32088 0d892d820a51 lock: avoid unintentional lock acquisition at failure of readlock FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32041 diff changeset	179 if not inst.locker:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	180 ui.error(_("(lock might be very busy)\n"))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	181 except error.LockUnavailable as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	182 ui.error(_("abort: could not lock %s: %s\n") %
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	183 (inst.desc or stringutil.forcebytestr(inst.filename),
afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	184 encoding.strtolocal(inst.strerror)))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	185 except error.OutOfBandError as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	186 if inst.args:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	187 msg = _("abort: remote error:\n")
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	188 else:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	189 msg = _("abort: remote error\n")
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	190 ui.error(msg)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	191 if inst.args:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	192 ui.error(''.join(inst.args))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	193 if inst.hint:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	194 ui.error('(%s)\n' % inst.hint)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	195 except error.RepoError as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	196 ui.error(_("abort: %s!\n") % inst)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	197 if inst.hint:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	198 ui.error(_("(%s)\n") % inst.hint)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	199 except error.ResponseError as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	200 ui.error(_("abort: %s") % inst.args[0])
36661 b76248e51605 scmutil: avoid using basestring and add explicit handling of unicodes Augie Fackler <augie@google.com> parents: 36658 diff changeset	201 msg = inst.args[1]
b76248e51605 scmutil: avoid using basestring and add explicit handling of unicodes Augie Fackler <augie@google.com> parents: 36658 diff changeset	202 if isinstance(msg, type(u'')):
b76248e51605 scmutil: avoid using basestring and add explicit handling of unicodes Augie Fackler <augie@google.com> parents: 36658 diff changeset	203 msg = pycompat.sysbytes(msg)
36695 c442c4a92ae8 scmutil: fix oversight in b76248e51605c6 where I forgot to use msg Augie Fackler <augie@google.com> parents: 36661 diff changeset	204 if not isinstance(msg, bytes):
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	205 ui.error(" %r\n" % (msg,))
36695 c442c4a92ae8 scmutil: fix oversight in b76248e51605c6 where I forgot to use msg Augie Fackler <augie@google.com> parents: 36661 diff changeset	206 elif not msg:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	207 ui.error(_(" empty string\n"))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	208 else:
38768 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("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	210 except error.CensoredNodeError as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	211 ui.error(_("abort: file censored %s!\n") % inst)
39777 b63dee7bd0d9 global: replace most uses of RevlogError with StorageError (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39694 diff changeset	212 except error.StorageError as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	213 ui.error(_("abort: %s!\n") % inst)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	214 except error.InterventionRequired as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	215 ui.error("%s\n" % inst)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	216 if inst.hint:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	217 ui.error(_("(%s)\n") % inst.hint)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	218 return 1
32659 7b17f9de6d3e revlog: map rev(wdirid) to WdirUnsupported exception Yuya Nishihara <yuya@tcha.org> parents: 32658 diff changeset	219 except error.WdirUnsupported:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	220 ui.error(_("abort: working directory revision cannot be specified\n"))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	221 except error.Abort as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	222 ui.error(_("abort: %s\n") % inst)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	223 if inst.hint:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	224 ui.error(_("(%s)\n") % inst.hint)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	225 except ImportError as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	226 ui.error(_("abort: %s!\n") % stringutil.forcebytestr(inst))
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	227 m = stringutil.forcebytestr(inst).split()[-1]
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	228 if m in "mpatch bdiff".split():
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	229 ui.error(_("(did you forget to compile extensions?)\n"))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	230 elif m in "zlib".split():
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	231 ui.error(_("(is your Python install correct?)\n"))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	232 except IOError as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	233 if util.safehasattr(inst, "code"):
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	234 ui.error(_("abort: %s\n") % stringutil.forcebytestr(inst))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	235 elif util.safehasattr(inst, "reason"):
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	236 try: # usually it is in the form (errno, strerror)
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	237 reason = inst.reason.args[1]
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	238 except (AttributeError, IndexError):
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	239 # it might be anything, for example a string
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	240 reason = inst.reason
38312 79dd61a4554f py3: replace `unicode` with pycompat.unicode Pulkit Goyal <7895pulkit@gmail.com> parents: 38250 diff changeset	241 if isinstance(reason, pycompat.unicode):
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	242 # SSLError of Python 2.7.9 contains a unicode
32152 994b0b1c77d6 py3: use encoding.unitolocal instead of .encode(encoding.encoding) Pulkit Goyal <7895pulkit@gmail.com> parents: 32115 diff changeset	243 reason = encoding.unitolocal(reason)
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	244 ui.error(_("abort: error: %s\n") % reason)
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	245 elif (util.safehasattr(inst, "args")
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	246 and inst.args and inst.args[0] == errno.EPIPE):
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	247 pass
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	248 elif getattr(inst, "strerror", None):
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	249 if getattr(inst, "filename", None):
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	250 ui.error(_("abort: %s: %s\n") % (
36641 77f98867538f py3: fix some unicode madness in global exception catcher Yuya Nishihara <yuya@tcha.org> parents: 36569 diff changeset	251 encoding.strtolocal(inst.strerror),
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	252 stringutil.forcebytestr(inst.filename)))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	253 else:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	254 ui.error(_("abort: %s\n") % encoding.strtolocal(inst.strerror))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	255 else:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	256 raise
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	257 except OSError as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	258 if getattr(inst, "filename", None) is not None:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	259 ui.error(_("abort: %s: '%s'\n") % (
36641 77f98867538f py3: fix some unicode madness in global exception catcher Yuya Nishihara <yuya@tcha.org> parents: 36569 diff changeset	260 encoding.strtolocal(inst.strerror),
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	261 stringutil.forcebytestr(inst.filename)))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	262 else:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	263 ui.error(_("abort: %s\n") % encoding.strtolocal(inst.strerror))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	264 except MemoryError:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	265 ui.error(_("abort: out of memory\n"))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	266 except SystemExit as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	267 # 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: 30417 diff changeset	268 # 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: 30417 diff changeset	269 return inst.code
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	270 except socket.error as inst:
38768 afc4ad706f9c dispatch: making all hg abortions be output with a specific label Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 38759 diff changeset	271 ui.error(_("abort: %s\n") % stringutil.forcebytestr(inst.args[-1]))
30520 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	272
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	273 return -1
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30417 diff changeset	274
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	275 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	276 # 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	277 # It makes strings difficult to translate.
17817 b17be267b59c scmutil: add function to validate new branch, tag, and bookmark names Kevin Bullock <kbullock@ringworld.org> parents: 17768 diff changeset	278 if lbl in ['tip', '.', 'null']:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26491 diff changeset	279 raise error.Abort(_("the name '%s' is reserved") % lbl)
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	280 for c in (':', '\0', '\n', '\r'):
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	281 if c in lbl:
36569 bb5f5c1c3c1b scmutil: fix a repr in an error message on Python 3 Augie Fackler <augie@google.com> parents: 36422 diff changeset	282 raise error.Abort(
bb5f5c1c3c1b scmutil: fix a repr in an error message on Python 3 Augie Fackler <augie@google.com> parents: 36422 diff changeset	283 _("%r cannot be used in a name") % pycompat.bytestr(c))
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	284 try:
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	285 int(lbl)
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26491 diff changeset	286 raise error.Abort(_("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	287 except ValueError:
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	288 pass
36145 4f3e989536c3 label: enforce the lack of leading or trailing white space Boris Feld <boris.feld@octobus.net> parents: 36137 diff changeset	289 if lbl.strip() != lbl:
4f3e989536c3 label: enforce the lack of leading or trailing white space Boris Feld <boris.feld@octobus.net> parents: 36137 diff changeset	290 raise error.Abort(_("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	291
13974 23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	292 def checkfilename(f):
23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	293 '''Check that the filename f is an acceptable filename for a tracked file'''
23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	294 if '\r' in f or '\n' in f:
38331 cf59de802883 py3: remove b'' from error message of disallowed filename Yuya Nishihara <yuya@tcha.org> parents: 38312 diff changeset	295 raise error.Abort(_("'\\n' and '\\r' disallowed in filenames: %r")
cf59de802883 py3: remove b'' from error message of disallowed filename Yuya Nishihara <yuya@tcha.org> parents: 38312 diff changeset	296 % pycompat.bytestr(f))
13974 23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	297
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	298 def checkportable(ui, f):
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	299 '''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	300 checkfilename(f)
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	301 abort, warn = checkportabilityalert(ui)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	302 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	303 msg = util.checkwinfilename(f)
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	304 if msg:
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37094 diff changeset	305 msg = "%s: %s" % (msg, procutil.shellquote(f))
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	306 if abort:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26491 diff changeset	307 raise error.Abort(msg)
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	308 ui.warn(_("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	309
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	310 def checkportabilityalert(ui):
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	311 '''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	312 non-portable filenames'''
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33352 diff changeset	313 val = ui.config('ui', 'portablefilenames')
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	314 lval = val.lower()
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36836 diff changeset	315 bval = stringutil.parsebool(val)
34645 75979c8d4572 codemod: use pycompat.iswindows Jun Wu <quark@fb.com> parents: 34620 diff changeset	316 abort = pycompat.iswindows or lval == 'abort'
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	317 warn = bval or lval == 'warn'
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	318 if bval is None and not (warn or abort or lval == 'ignore'):
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	319 raise error.ConfigError(
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	320 _("ui.portablefilenames value is invalid ('%s')") % val)
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	321 return abort, warn
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	322
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	323 class casecollisionauditor(object):
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	324 def __init__(self, ui, abort, dirstate):
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	325 self._ui = ui
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	326 self._abort = abort
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	327 allfiles = '\0'.join(dirstate._map)
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	328 self._loweredfiles = set(encoding.lower(allfiles).split('\0'))
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	329 self._dirstate = dirstate
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	330 # 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	331 # 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	332 # same filename twice.
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	333 self._newfiles = set()
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	334
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	335 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	336 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	337 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	338 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	339 if fl in self._loweredfiles and f not in self._dirstate:
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	340 msg = _('possible case-folding collision for %s') % f
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	341 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	342 raise error.Abort(msg)
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	343 self._ui.warn(_("warning: %s\n") % msg)
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	344 self._loweredfiles.add(fl)
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	345 self._newfiles.add(f)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	346
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	347 def filteredhash(repo, maxrev):
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	348 """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	349
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	350 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	351 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	352 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	353 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	354 tipnode changing.
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	355
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	356 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	357 that SHA-1 digest.
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	358 """
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	359 cl = repo.changelog
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	360 if not cl.filteredrevs:
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	361 return None
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	362 key = None
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	363 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	364 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	365 s = hashlib.sha1()
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	366 for rev in revs:
31349 719e64bf9ec2 scmutil: fix key generation to portably bytestringify integer Augie Fackler <augie@google.com> parents: 31285 diff changeset	367 s.update('%d;' % rev)
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	368 key = s.digest()
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	369 return key
467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24693 diff changeset	370
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	371 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	372 '''yield every hg repository under path, always recursively.
5a9acb0b2086 help: improve hgweb help Mads Kiilerich <mads@kiilerich.com> parents: 17037 diff changeset	373 The recurse flag will only control recursion into repo working dirs'''
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	374 def errhandler(err):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	375 if err.filename == path:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	376 raise err
14961 5523529bd1af walkrepos: use getattr instead of hasattr for samestat Augie Fackler <durin42@gmail.com> parents: 14928 diff changeset	377 samestat = getattr(os.path, 'samestat', None)
5523529bd1af walkrepos: use getattr instead of hasattr for samestat Augie Fackler <durin42@gmail.com> parents: 14928 diff changeset	378 if followsym and samestat is not None:
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	379 def adddir(dirlst, dirname):
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	380 dirstat = os.stat(dirname)
36338 ddd9474d2e08 walkrepos: don't reimplement any() Martin von Zweigbergk <martinvonz@google.com> parents: 36313 diff changeset	381 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	382 if not match:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	383 dirlst.append(dirstat)
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	384 return not match
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	385 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	386 followsym = False
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	387
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	388 if (seen_dirs is None) and followsym:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	389 seen_dirs = []
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	390 adddir(seen_dirs, path)
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	391 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	392 dirs.sort()
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	393 if '.hg' in dirs:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	394 yield root # found a repository
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	395 qroot = os.path.join(root, '.hg', 'patches')
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	396 if os.path.isdir(os.path.join(qroot, '.hg')):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	397 yield qroot # we have a patch queue repo here
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	398 if recurse:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	399 # avoid recursing inside the .hg directory
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	400 dirs.remove('.hg')
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	401 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	402 dirs[:] = [] # don't descend further
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	403 elif followsym:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	404 newdirs = []
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	405 for d in dirs:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	406 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	407 if adddir(seen_dirs, fname):
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	408 if os.path.islink(fname):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	409 for hgname in walkrepos(fname, True, seen_dirs):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	410 yield hgname
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	411 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	412 newdirs.append(d)
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	413 dirs[:] = newdirs
13984 af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	414
32658 55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	415 def binnode(ctx):
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	416 """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: 32656 diff changeset	417 node = ctx.node()
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	418 if node is None:
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	419 return wdirid
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	420 return node
55ff67ffcead scmutil: introduce binnode(ctx) as paired function with intrev(ctx) Yuya Nishihara <yuya@tcha.org> parents: 32656 diff changeset	421
32656 4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32270 diff changeset	422 def intrev(ctx):
4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32270 diff changeset	423 """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	424 arithmetic operation"""
32656 4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32270 diff changeset	425 rev = ctx.rev()
24582 56fff44cce98 scmutil: add function to help handling workingctx in arithmetic operation Yuya Nishihara <yuya@tcha.org> parents: 24447 diff changeset	426 if rev is None:
25739 3dabc9b7494a changeset_printer: use node.wdirrev to calculate meaningful parentrevs Yuya Nishihara <yuya@tcha.org> parents: 25660 diff changeset	427 return wdirrev
24582 56fff44cce98 scmutil: add function to help handling workingctx in arithmetic operation Yuya Nishihara <yuya@tcha.org> parents: 24447 diff changeset	428 return rev
56fff44cce98 scmutil: add function to help handling workingctx in arithmetic operation Yuya Nishihara <yuya@tcha.org> parents: 24447 diff changeset	429
34327 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	430 def formatchangeid(ctx):
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	431 """Format changectx as '{rev}:{node\|formatnode}', which is the default
35888 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35748 diff changeset	432 template provided by logcmdutil.changesettemplater"""
34327 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	433 repo = ctx.repo()
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	434 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: 34146 diff changeset	435
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	436 def formatrevnode(ui, rev, node):
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	437 """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: 34146 diff changeset	438 if ui.debugflag:
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	439 hexfunc = hex
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	440 else:
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	441 hexfunc = short
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	442 return '%d:%s' % (rev, hexfunc(node))
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34146 diff changeset	443
37678 5f8f013e7d52 scmutil: rename resolvepartialhexnodeid() to resolvehexnodeidprefix() Martin von Zweigbergk <martinvonz@google.com> parents: 37677 diff changeset	444 def resolvehexnodeidprefix(repo, prefix):
38855 7848f284b211 revisions: allow "x123" to refer to nodeid prefix "123" Martin von Zweigbergk <martinvonz@google.com> parents: 38854 diff changeset	445 if (prefix.startswith('x') and
7848f284b211 revisions: allow "x123" to refer to nodeid prefix "123" Martin von Zweigbergk <martinvonz@google.com> parents: 38854 diff changeset	446 repo.ui.configbool('experimental', 'revisions.prefixhexnode')):
7848f284b211 revisions: allow "x123" to refer to nodeid prefix "123" Martin von Zweigbergk <martinvonz@google.com> parents: 38854 diff changeset	447 prefix = prefix[1:]
38842 503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	448 try:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	449 # 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: 38841 diff changeset	450 # This matches the shortesthexnodeidprefix() function below.
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	451 node = repo.unfiltered().changelog._partialmatch(prefix)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	452 except error.AmbiguousPrefixLookupError:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	453 revset = repo.ui.config('experimental', 'revisions.disambiguatewithin')
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	454 if revset:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	455 # Clear config to avoid infinite recursion
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	456 configoverrides = {('experimental',
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	457 'revisions.disambiguatewithin'): None}
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	458 with repo.ui.configoverride(configoverrides):
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	459 revs = repo.anyrevs([revset], user=True)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	460 matches = []
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	461 for rev in revs:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	462 node = repo.changelog.node(rev)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	463 if hex(node).startswith(prefix):
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	464 matches.append(node)
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	465 if len(matches) == 1:
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	466 return matches[0]
503f936489dd lookup: add option to disambiguate prefix within revset Martin von Zweigbergk <martinvonz@google.com> parents: 38841 diff changeset	467 raise
37504 901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	468 if node is None:
901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	469 return
901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	470 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	471 return node
901e749ca0e1 context: extract partial nodeid lookup method to scmutil Martin von Zweigbergk <martinvonz@google.com> parents: 37463 diff changeset	472
38854 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	473 def mayberevnum(repo, prefix):
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	474 """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: 38853 diff changeset	475 try:
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	476 i = int(prefix)
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	477 # 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: 38853 diff changeset	478 # confused as a rev; or, obviously, if the int is larger
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	479 # than the value of the tip rev
39360 570fca90d556 shortest: fix an off-by-1 when disambiguating against revnums Martin von Zweigbergk <martinvonz@google.com> parents: 39301 diff changeset	480 if prefix[0:1] == b'0' or i >= len(repo):
38854 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	481 return False
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	482 return True
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	483 except ValueError:
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	484 return False
531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	485
38853 3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	486 def shortesthexnodeidprefix(repo, node, minlength=1, cache=None):
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	487 """Find the shortest unambiguous prefix that matches hexnode.
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	488
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	489 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: 38843 diff changeset	490 caching between calls to this method.
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	491 """
37708 8e8541610d85 scmutil: make shortesthexnodeidprefix() use unfiltered repo Martin von Zweigbergk <martinvonz@google.com> parents: 37680 diff changeset	492 # _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	493 # 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	494 # unfiltered space, which means some hashes may be slightly longer.
37971 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	495
3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	496 def disambiguate(prefix):
3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	497 """Disambiguate against revnums."""
38856 a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38855 diff changeset	498 if repo.ui.configbool('experimental', 'revisions.prefixhexnode'):
a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38855 diff changeset	499 if mayberevnum(repo, prefix):
a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38855 diff changeset	500 return 'x' + prefix
a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38855 diff changeset	501 else:
a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38855 diff changeset	502 return prefix
a01200b25da6 shortest: use 'x' prefix to disambiguate from revnum if configured Martin von Zweigbergk <martinvonz@google.com> parents: 38855 diff changeset	503
37971 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	504 hexnode = hex(node)
37979 5ac72e07692a shortest: avoid magic number "41" Martin von Zweigbergk <martinvonz@google.com> parents: 37971 diff changeset	505 for length in range(len(prefix), len(hexnode) + 1):
37971 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	506 prefix = hexnode[:length]
38854 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	507 if not mayberevnum(repo, prefix):
37971 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	508 return prefix
3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	509
38854 531b86cc8fb3 shortest: make isrev() a top-level function Martin von Zweigbergk <martinvonz@google.com> parents: 38853 diff changeset	510 cl = repo.unfiltered().changelog
38843 6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	511 revset = repo.ui.config('experimental', 'revisions.disambiguatewithin')
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	512 if revset:
38853 3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	513 revs = None
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	514 if cache is not None:
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	515 revs = cache.get('disambiguationrevset')
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	516 if revs is None:
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	517 revs = repo.anyrevs([revset], user=True)
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	518 if cache is not None:
3588e41f796d shortest: cache disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38843 diff changeset	519 cache['disambiguationrevset'] = revs
38843 6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	520 if cl.rev(node) in revs:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	521 hexnode = hex(node)
39226 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	522 nodetree = None
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	523 if cache is not None:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	524 nodetree = cache.get('disambiguationnodetree')
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	525 if not nodetree:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	526 try:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	527 nodetree = parsers.nodetree(cl.index, len(revs))
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	528 except AttributeError:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	529 # no native nodetree
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	530 pass
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	531 else:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	532 for r in revs:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	533 nodetree.insert(r)
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	534 if cache is not None:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	535 cache['disambiguationnodetree'] = nodetree
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	536 if nodetree is not None:
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	537 length = max(nodetree.shortest(node), minlength)
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	538 prefix = hexnode[:length]
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39088 diff changeset	539 return disambiguate(prefix)
38843 6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	540 for length in range(minlength, len(hexnode) + 1):
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	541 matches = []
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	542 prefix = hexnode[:length]
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	543 for rev in revs:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	544 otherhexnode = repo[rev].hex()
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	545 if prefix == otherhexnode[:length]:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	546 matches.append(otherhexnode)
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	547 if len(matches) == 1:
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	548 return disambiguate(prefix)
6f7c9527030b scmutil: make shortest() respect disambiguation revset Martin von Zweigbergk <martinvonz@google.com> parents: 38842 diff changeset	549
37865 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	550 try:
37971 3ac950cd5978 shortest: move revnum-disambiguation out of revlog Martin von Zweigbergk <martinvonz@google.com> parents: 37960 diff changeset	551 return disambiguate(cl.shortest(node, minlength))
37865 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	552 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	553 raise error.RepoLookupError()
37680 e743b8524d60 scmutil: introduce shortesthexnodeidprefix() Martin von Zweigbergk <martinvonz@google.com> parents: 37679 diff changeset	554
37350 e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	555 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	556 """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	557
38841 df0873ab5c14 revlog: use specialized exception for ambiguous prefix lookup Martin von Zweigbergk <martinvonz@google.com> parents: 38799 diff changeset	558 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: 38799 diff changeset	559 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	560 """
37350 e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	561 try:
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	562 revsymbol(repo, symbol)
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	563 return True
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	564 except error.RepoLookupError:
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	565 return False
e32dfff71529 revset: use revsymbol() for checking if a symbol is valid Martin von Zweigbergk <martinvonz@google.com> parents: 37306 diff changeset	566
37271 0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	567 def revsymbol(repo, symbol):
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	568 """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: 37269 diff changeset	569
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	570 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: 37269 diff changeset	571 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: 37269 diff changeset	572 not "max(public())".
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	573 """
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	574 if not isinstance(symbol, bytes):
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	575 msg = ("symbol (%s of type %s) was not a string, did you mean "
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	576 "repo[symbol]?" % (symbol, type(symbol)))
0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	577 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	578 try:
37527 1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	579 if symbol in ('.', 'tip', 'null'):
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	580 return repo[symbol]
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	581
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	582 try:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	583 r = int(symbol)
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	584 if '%d' % r != symbol:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	585 raise ValueError
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	586 l = len(repo.changelog)
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	587 if r < 0:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	588 r += l
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	589 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	590 raise ValueError
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	591 return repo[r]
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	592 except error.FilteredIndexError:
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	593 raise
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	594 except (ValueError, OverflowError, IndexError):
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	595 pass
1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	596
37528 d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	597 if len(symbol) == 40:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	598 try:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	599 node = bin(symbol)
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	600 rev = repo.changelog.rev(node)
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	601 return repo[rev]
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	602 except error.FilteredLookupError:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	603 raise
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	604 except (TypeError, LookupError):
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	605 pass
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	606
37529 45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	607 # look up bookmarks through the name interface
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	608 try:
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	609 node = repo.names.singlenode(repo, symbol)
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	610 rev = repo.changelog.rev(node)
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	611 return repo[rev]
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	612 except KeyError:
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	613 pass
45667439439e context: handle namespaces in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37528 diff changeset	614
37679 ab828755e1ea scmutil: use resolvehexnodeidprefix() from revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37678 diff changeset	615 node = resolvehexnodeidprefix(repo, symbol)
37530 35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	616 if node is not None:
35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	617 rev = repo.changelog.rev(node)
35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	618 return repo[rev]
35b34202dd3b context: handle partial nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37529 diff changeset	619
37531 6639ac97ec3b revsymbol: stop delegating to repo.__getitem__ for unhandled symbols (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37530 diff changeset	620 raise error.RepoLookupError(_("unknown revision '%s'") % symbol)
37527 1c09481acdcc context: handle stringified ints in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37504 diff changeset	621
37528 d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	622 except error.WdirUnsupported:
d2b484eed1ec scmutil: handle full hex nodeids in revsymbol() Martin von Zweigbergk <martinvonz@google.com> parents: 37527 diff changeset	623 return repo[None]
37385 ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	624 except (error.FilteredIndexError, error.FilteredLookupError,
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	625 error.FilteredRepoLookupError):
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	626 raise _filterederror(repo, symbol)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	627
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	628 def _filterederror(repo, changeid):
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	629 """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	630
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	631 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	632 experiment with various message variants."""
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	633 if repo.filtername.startswith('visible'):
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	634
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	635 # 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	636 unfilteredrepo = repo.unfiltered()
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	637 ctx = revsymbol(unfilteredrepo, changeid)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	638
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	639 # 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	640 # 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	641 if ctx.obsolete():
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	642 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	643 else:
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	644 msg = _("hidden revision '%s'") % changeid
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	645
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	646 hint = _('use --hidden to access hidden revisions')
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	647
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	648 return error.FilteredRepoLookupError(msg, hint=hint)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	649 msg = _("filtered revision '%s' (not in '%s' subset)")
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	650 msg %= (changeid, repo.filtername)
ecd3f6909184 context: move handling of filtering error to revsymbol() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37360 diff changeset	651 return error.FilteredRepoLookupError(msg)
37271 0194dac77c93 scmutil: add method for looking up a context given a revision symbol Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	652
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 33798 diff changeset	653 def revsingle(repo, revspec, default='.', localalias=None):
19509 8963a706e075 revsingle: fix silly API issue (issue2992) Matt Mackall <mpm@selenic.com> parents: 19154 diff changeset	654 if not revspec and revspec != 0:
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	655 return repo[default]
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	656
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 33798 diff changeset	657 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	658 if not l:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26491 diff changeset	659 raise error.Abort(_('empty revision set'))
22815 4f81470e83bf revsingle: use `last` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22814 diff changeset	660 return repo[l.last()]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	661
26020 cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	662 def _pairspec(revspec):
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 30639 diff changeset	663 tree = revsetlang.parse(revspec)
26020 cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	664 return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall')
cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	665
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	666 def revpair(repo, revs):
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	667 if not revs:
37252 e9ee540af434 scmutil: make revpair() return context objects (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37251 diff changeset	668 return repo['.'], repo[None]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	669
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	670 l = revrange(repo, revs)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	671
20862 97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	672 if not l:
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	673 first = second = None
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	674 elif l.isascending():
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	675 first = l.min()
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	676 second = l.max()
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	677 elif l.isdescending():
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	678 first = l.max()
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	679 second = l.min()
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	680 else:
22816 20d998395ee7 revpair: use `first` and `last` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22815 diff changeset	681 first = l.first()
20d998395ee7 revpair: use `first` and `last` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22815 diff changeset	682 second = l.last()
20862 97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	683
97b2f26dfc43 revpair: smartset compatibility Pierre-Yves David <pierre-yves.david@fb.com> parents: 20820 diff changeset	684 if first is None:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26491 diff changeset	685 raise error.Abort(_('empty revision range'))
26836 88c4e97b9669 scmutil: abort if an empty revision is given to revpair() Matt Harbison <matt_harbison@yahoo.com> parents: 26587 diff changeset	686 if (first == second and len(revs) >= 2
88c4e97b9669 scmutil: abort if an empty revision is given to revpair() Matt Harbison <matt_harbison@yahoo.com> parents: 26587 diff changeset	687 and not all(revrange(repo, [r]) for r in revs)):
88c4e97b9669 scmutil: abort if an empty revision is given to revpair() Matt Harbison <matt_harbison@yahoo.com> parents: 26587 diff changeset	688 raise error.Abort(_('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	689
26020 cc3a30ff9490 revpair: restrict odd-range handling to top-level x:y expression (issue4774) Yuya Nishihara <yuya@tcha.org> parents: 25928 diff changeset	690 # 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	691 if first == second and len(revs) == 1 and not _pairspec(revs[0]):
37252 e9ee540af434 scmutil: make revpair() return context objects (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37251 diff changeset	692 return repo[first], repo[None]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	693
37252 e9ee540af434 scmutil: make revpair() return context objects (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37251 diff changeset	694 return repo[first], repo[second]
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	695
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 33798 diff changeset	696 def revrange(repo, specs, localalias=None):
29417 526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	697 """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	698
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	699 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	700 config options, such as revset aliases.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	701
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	702 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	703 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	704
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	705 ``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	706 revision numbers.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	707
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	708 It is assumed the revsets are already formatted. If you have arguments
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 30639 diff changeset	709 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	710 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	711
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	712 Specifying a single revset is allowed.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	713
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	714 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	715 integer revisions.
526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	716 """
25928 4ee4f7415095 revrange: evaluate all revset specs at once Yuya Nishihara <yuya@tcha.org> parents: 25904 diff changeset	717 allspecs = []
29417 526b027b0130 scmutil: improve documentation of revset APIs Gregory Szorc <gregory.szorc@gmail.com> parents: 29389 diff changeset	718 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	719 if isinstance(spec, int):
31024 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 30639 diff changeset	720 spec = revsetlang.formatspec('rev(%d)', spec)
25928 4ee4f7415095 revrange: evaluate all revset specs at once Yuya Nishihara <yuya@tcha.org> parents: 25904 diff changeset	721 allspecs.append(spec)
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 33798 diff changeset	722 return repo.anyrevs(allspecs, user=True, localalias=localalias)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	723
26433 3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	724 def meaningfulparents(repo, ctx):
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	725 """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	726
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	727 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	728 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	729 is not the preceding revision.
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	730 """
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	731 parents = ctx.parents()
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	732 if len(parents) > 1:
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	733 return parents
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	734 if repo.ui.debugflag:
39894 d739f423bf06 repo: look up nullrev context by revnum, not symbolic name Martin von Zweigbergk <martinvonz@google.com> parents: 39891 diff changeset	735 return [parents[0], repo[nullrev]]
32656 4bec8cce6a09 scmutil: pass ctx object to intrev() Yuya Nishihara <yuya@tcha.org> parents: 32270 diff changeset	736 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	737 return []
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	738 return parents
3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26421 diff changeset	739
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	740 def expandpats(pats):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	741 '''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	742 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	743 if not util.expandglobs:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	744 return list(pats)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	745 ret = []
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	746 for kindpat in pats:
9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	747 kind, pat = matchmod._patsplit(kindpat, None)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	748 if kind is None:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	749 try:
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	750 globbed = glob.glob(pat)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	751 except re.error:
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	752 globbed = [pat]
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	753 if globbed:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	754 ret.extend(globbed)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	755 continue
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	756 ret.append(kindpat)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	757 return ret
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	758
26326 58218b0e6005 match: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26325 diff changeset	759 def matchandpats(ctx, pats=(), opts=None, globbed=False, default='relpath',
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	760 badfn=None):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	761 '''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	762 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	763 is provided.'''
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	764 if pats == ("",):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	765 pats = []
26326 58218b0e6005 match: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26325 diff changeset	766 if opts is None:
58218b0e6005 match: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26325 diff changeset	767 opts = {}
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	768 if not globbed and default == 'relpath':
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	769 pats = expandpats(pats or [])
14670 19197fa4c41c scmutil: match now accepts a context or a repo Matt Mackall <mpm@selenic.com> parents: 14669 diff changeset	770
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	771 def bad(f, msg):
24338 ca1365078c86 scmutil: replace 'ctx._repo' with 'ctx.repo()' Matt Harbison <matt_harbison@yahoo.com> parents: 24175 diff changeset	772 ctx.repo().ui.warn("%s: %s\n" % (m.rel(f), msg))
25466 007a1d53f7c3 scmutil: use the optional badfn argument when building a matcher Matt Harbison <matt_harbison@yahoo.com> parents: 25434 diff changeset	773
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	774 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	775 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	776
25466 007a1d53f7c3 scmutil: use the optional badfn argument when building a matcher Matt Harbison <matt_harbison@yahoo.com> parents: 25434 diff changeset	777 m = ctx.match(pats, opts.get('include'), opts.get('exclude'),
007a1d53f7c3 scmutil: use the optional badfn argument when building a matcher Matt Harbison <matt_harbison@yahoo.com> parents: 25434 diff changeset	778 default, listsubrepos=opts.get('subrepos'), badfn=badfn)
007a1d53f7c3 scmutil: use the optional badfn argument when building a matcher Matt Harbison <matt_harbison@yahoo.com> parents: 25434 diff changeset	779
24447 d44d53bc9a1e matcher: make e.g. 'relpath:.' lead to fast paths Martin von Zweigbergk <martinvonz@google.com> parents: 24338 diff changeset	780 if m.always():
d44d53bc9a1e matcher: make e.g. 'relpath:.' lead to fast paths Martin von Zweigbergk <martinvonz@google.com> parents: 24338 diff changeset	781 pats = []
16171 336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	782 return m, pats
336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	783
26328 188c1e9506f5 match: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26327 diff changeset	784 def match(ctx, pats=(), opts=None, globbed=False, default='relpath',
188c1e9506f5 match: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26327 diff changeset	785 badfn=None):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	786 '''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	787 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	788
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	789 def matchall(repo):
21111 9d28fd795215 match: improve documentation - docstrings and more descriptive variable naming Mads Kiilerich <madski@unity3d.com> parents: 20980 diff changeset	790 '''Return a matcher that will efficiently match everything.'''
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	791 return matchmod.always(repo.root, repo.getcwd())
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	792
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	793 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	794 '''Return a matcher that will efficiently match exactly these files.'''
25467 f64dbe06f3d0 scmutil: add an optional parameter to matcher factories for a bad() override Matt Harbison <matt_harbison@yahoo.com> parents: 25466 diff changeset	795 return matchmod.exact(repo.root, repo.getcwd(), files, badfn=badfn)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	796
34854 39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	797 def parsefollowlinespattern(repo, rev, pat, msg):
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	798 """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	799 logic.
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	800 """
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	801 if not matchmod.patkind(pat):
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	802 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	803 else:
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	804 ctx = repo[rev]
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	805 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	806 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	807 if len(files) != 1:
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	808 raise error.ParseError(msg)
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	809 return files[0]
39b094e4ae2c revset: extract a parsefollowlinespattern helper function Denis Laxalde <denis.laxalde@logilab.fr> parents: 34793 diff changeset	810
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	811 def origpath(ui, repo, filepath):
07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	812 '''customize where .orig files are created
07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	813
07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	814 Fetch user defined path from config file: [ui] origbackuppath = <path>
34146 9e4f82bc2b0b scmutil: don't append .orig to backups in origbackuppath (BC) Mark Thomas <mbthomas@fb.com> parents: 34022 diff changeset	815 Fall back to default (filepath with .orig suffix) if not specified
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	816 '''
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33352 diff changeset	817 origbackuppath = ui.config('ui', 'origbackuppath')
34543 6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	818 if not origbackuppath:
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	819 return filepath + ".orig"
07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	820
34543 6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	821 # Convert filepath from an absolute path into a path inside the repo.
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	822 filepathfromroot = util.normpath(os.path.relpath(filepath,
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	823 start=repo.root))
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	824
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	825 origvfs = vfs.vfs(repo.wjoin(origbackuppath))
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	826 origbackupdir = origvfs.dirname(filepathfromroot)
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	827 if not origvfs.isdir(origbackupdir) or origvfs.islink(origbackupdir):
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	828 ui.note(_('creating directory: %s\n') % origvfs.join(origbackupdir))
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	829
34543 6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	830 # Remove any files that conflict with the backup file's path
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	831 for f in reversed(list(util.finddirs(filepathfromroot))):
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	832 if origvfs.isfileorlink(f):
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	833 ui.note(_('removing conflicting file: %s\n')
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	834 % origvfs.join(f))
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	835 origvfs.unlink(f)
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	836 break
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	837
34543 6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	838 origvfs.makedirs(origbackupdir)
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	839
35009 99ab7bc944d2 scmutil: don't try to delete origbackup symlinks to directories (issue5731) Mark Thomas <mbthomas@fb.com> parents: 34854 diff changeset	840 if origvfs.isdir(filepathfromroot) and not origvfs.islink(filepathfromroot):
34543 6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	841 ui.note(_('removing conflicting directory: %s\n')
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	842 % origvfs.join(filepathfromroot))
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	843 origvfs.rmtree(filepathfromroot, forcibly=True)
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	844
6fad8059a970 scmutil: handle conflicting files and dirs in origbackuppath Mark Thomas <mbthomas@fb.com> parents: 34542 diff changeset	845 return origvfs.join(filepathfromroot)
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27610 diff changeset	846
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	847 class _containsnode(object):
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	848 """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	849
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	850 def __init__(self, repo, revcontainer):
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	851 self._torev = repo.changelog.rev
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	852 self._revcontains = revcontainer.__contains__
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	853
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	854 def __contains__(self, node):
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	855 return self._revcontains(self._torev(node))
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	856
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	857 def cleanupnodes(repo, replacements, operation, moves=None, metadata=None,
38799 2002c193f2bc rebase: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38783 diff changeset	858 fixphase=False, targetphase=None, backup=True):
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	859 """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: 32659 diff changeset	860
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	861 That includes writing obsmarkers or stripping nodes, and moving bookmarks.
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	862 (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: 32659 diff changeset	863
34354 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	864 By default, bookmark moves are calculated automatically from 'replacements',
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	865 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: 34353 diff changeset	866 additional bookmark moves that should not have associated obsmarkers.
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	867
34353 2dbd6d259cd2 cleanupnodes: rename "mapping" to "replacements" Martin von Zweigbergk <martinvonz@google.com> parents: 34352 diff changeset	868 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: 34352 diff changeset	869 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	870
3df59451cdec scmutil: add capability to cleanupnodes to take obsmarker metadata Pulkit Goyal <7895pulkit@gmail.com> parents: 34737 diff changeset	871 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	872 obsolescence is enabled.
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	873 """
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	874 assert fixphase or targetphase is None
34354 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	875 if not replacements and not moves:
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	876 return
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	877
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	878 # translate mapping's other forms
34353 2dbd6d259cd2 cleanupnodes: rename "mapping" to "replacements" Martin von Zweigbergk <martinvonz@google.com> parents: 34352 diff changeset	879 if not util.safehasattr(replacements, 'items'):
39891 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	880 replacements = {(n,): () for n in replacements}
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	881 else:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	882 # upgrading non tuple "source" to tuple ones for BC
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	883 repls = {}
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	884 for key, value in replacements.items():
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	885 if not isinstance(key, tuple):
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	886 key = (key,)
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	887 repls[key] = value
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	888 replacements = repls
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	889
34352 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33649 diff changeset	890 # Calculate bookmark movements
34354 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	891 if moves is None:
2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	892 moves = {}
34353 2dbd6d259cd2 cleanupnodes: rename "mapping" to "replacements" Martin von Zweigbergk <martinvonz@google.com> parents: 34352 diff changeset	893 # Unfiltered repo is needed since nodes in replacements might be hidden.
34352 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33649 diff changeset	894 unfi = repo.unfiltered()
39891 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	895 for oldnodes, newnodes in replacements.items():
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	896 for oldnode in oldnodes:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	897 if oldnode in moves:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	898 continue
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	899 if len(newnodes) > 1:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	900 # usually a split, take the one with biggest rev number
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	901 newnode = next(unfi.set('max(%ln)', newnodes)).node()
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	902 elif len(newnodes) == 0:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	903 # move bookmark backwards
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	904 allreplaced = []
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	905 for rep in replacements:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	906 allreplaced.extend(rep)
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	907 roots = list(unfi.set('max((::%n) - %ln)', oldnode,
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	908 allreplaced))
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	909 if roots:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	910 newnode = roots[0].node()
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	911 else:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	912 newnode = nullid
34352 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33649 diff changeset	913 else:
39891 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	914 newnode = newnodes[0]
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	915 moves[oldnode] = newnode
34352 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33649 diff changeset	916
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	917 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: 38419 diff changeset	918 toretract = {}
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	919 toadvance = {}
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	920 if fixphase:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	921 precursors = {}
39891 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	922 for oldnodes, newnodes in replacements.items():
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	923 for oldnode in oldnodes:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	924 for newnode in newnodes:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	925 precursors.setdefault(newnode, []).append(oldnode)
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	926
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	927 allnewnodes.sort(key=lambda n: unfi[n].rev())
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	928 newphases = {}
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	929 def phase(ctx):
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	930 return newphases.get(ctx.node(), ctx.phase())
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	931 for newnode in allnewnodes:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	932 ctx = unfi[newnode]
38432 05b7dd11918e cleanupnodes: preserve phase of parents of new nodes Martin von Zweigbergk <martinvonz@google.com> parents: 38423 diff changeset	933 parentphase = max(phase(p) for p in ctx.parents())
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	934 if targetphase is None:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	935 oldphase = max(unfi[oldnode].phase()
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	936 for oldnode in precursors[newnode])
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	937 newphase = max(oldphase, parentphase)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	938 else:
38432 05b7dd11918e cleanupnodes: preserve phase of parents of new nodes Martin von Zweigbergk <martinvonz@google.com> parents: 38423 diff changeset	939 newphase = max(targetphase, parentphase)
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	940 newphases[newnode] = newphase
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	941 if newphase > ctx.phase():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	942 toretract.setdefault(newphase, []).append(newnode)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	943 elif newphase < ctx.phase():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	944 toadvance.setdefault(newphase, []).append(newnode)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	945
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	946 with repo.transaction('cleanup') as tr:
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	947 # Move bookmarks
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	948 bmarks = repo._bookmarks
33511 9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	949 bmarkchanges = []
34352 033a5befbaf7 cleanupnodes: separate out bookmark destination calculation from actual update Martin von Zweigbergk <martinvonz@google.com> parents: 33649 diff changeset	950 for oldnode, newnode in moves.items():
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	951 oldbmarks = repo.nodebookmarks(oldnode)
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	952 if not oldbmarks:
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	953 continue
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	954 from . import bookmarks # avoid import cycle
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	955 repo.ui.debug('moving bookmarks %r from %s to %s\n' %
38575 152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38503 diff changeset	956 (pycompat.rapply(pycompat.maybebytestr, oldbmarks),
36836 a00c38b33047 py3: drop b'' from debug message "moving bookmarks" Yuya Nishihara <yuya@tcha.org> parents: 36695 diff changeset	957 hex(oldnode), hex(newnode)))
33331 4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	958 # Delete divergent bookmarks being parents of related newnodes
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	959 deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	960 allnewnodes, newnode, oldnode)
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks Jun Wu <quark@fb.com> parents: 33330 diff changeset	961 deletenodes = _containsnode(repo, deleterevs)
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	962 for name in oldbmarks:
33511 9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	963 bmarkchanges.append((name, newnode))
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	964 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	965 bmarkchanges.append((b, None))
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	966
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	967 if bmarkchanges:
9689239d7c2b bookmark: use 'divergent2delete' in 'scmutil.cleanupnode' Boris Feld <boris.feld@octobus.net> parents: 33505 diff changeset	968 bmarks.applychanges(repo, tr, bmarkchanges)
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	969
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	970 for phase, nodes in toretract.items():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	971 phases.retractboundary(repo, tr, phase, nodes)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	972 for phase, nodes in toadvance.items():
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	973 phases.advanceboundary(repo, tr, phase, nodes)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38419 diff changeset	974
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	975 # Obsolete or strip nodes
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	976 if obsolete.isenabled(repo, obsolete.createmarkersopt):
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	977 # 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: 32659 diff changeset	978 # without a successor, skip that obssolete request since it's
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	979 # 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: 32659 diff changeset	980 # 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: 32659 diff changeset	981 # some obsstore logic.
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	982 # NOTE: the filtering and sorting might belong to createmarkers.
33330 ba43e5ee9c6d scmutil: make cleanupnodes handle filtered node Jun Wu <quark@fb.com> parents: 33252 diff changeset	983 isobs = unfi.obsstore.successors.__contains__
ba43e5ee9c6d scmutil: make cleanupnodes handle filtered node Jun Wu <quark@fb.com> parents: 33252 diff changeset	984 torev = unfi.changelog.rev
39891 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	985 sortfunc = lambda ns: torev(ns[0][0])
39890 1c3f1491965f scmutil: expand long "one-liner" Boris Feld <boris.feld@octobus.net> parents: 39836 diff changeset	986 rels = []
39891 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	987 for ns, s in sorted(replacements.items(), key=sortfunc):
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	988 for n in ns:
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	989 if s or not isobs(n):
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	990 rel = (unfi[n], tuple(unfi[m] for m in s))
b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	991 rels.append(rel)
34354 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	992 if rels:
34793 3df59451cdec scmutil: add capability to cleanupnodes to take obsmarker metadata Pulkit Goyal <7895pulkit@gmail.com> parents: 34737 diff changeset	993 obsolete.createmarkers(repo, rels, operation=operation,
3df59451cdec scmutil: add capability to cleanupnodes to take obsmarker metadata Pulkit Goyal <7895pulkit@gmail.com> parents: 34737 diff changeset	994 metadata=metadata)
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	995 else:
65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	996 from . import repair # avoid import cycle
39891 b99903534e06 scmutil: accept multiple predecessors in 'replacements' (API) Boris Feld <boris.feld@octobus.net> parents: 39890 diff changeset	997 tostrip = list(n for ns in replacements for n in ns)
34354 2f427b57bf90 rebase: move bookmarks with --keep (issue5682) Jun Wu <quark@fb.com> parents: 34353 diff changeset	998 if tostrip:
38799 2002c193f2bc rebase: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38783 diff changeset	999 repair.delayedstrip(repo.ui, repo, tostrip, operation,
2002c193f2bc rebase: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38783 diff changeset	1000 backup=backup)
33088 65cadeea6c22 scmutil: add a cleanupnodes method for developers Jun Wu <quark@fb.com> parents: 32659 diff changeset	1001
37269 14cd5290c4e6 addremove: remove dry_run, similarity from scmutil.addremove (API) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 37259 diff changeset	1002 def addremove(repo, matcher, prefix, opts=None):
26329 d9537ce64f3a addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26328 diff changeset	1003 if opts is None:
d9537ce64f3a addremove: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26328 diff changeset	1004 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	1005 m = matcher
37269 14cd5290c4e6 addremove: remove dry_run, similarity from scmutil.addremove (API) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 37259 diff changeset	1006 dry_run = opts.get('dry_run')
37306 6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37271 diff changeset	1007 try:
6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37271 diff changeset	1008 similarity = float(opts.get('similarity') or 0)
6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37271 diff changeset	1009 except ValueError:
6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37271 diff changeset	1010 raise error.Abort(_('similarity must be a number'))
6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37271 diff changeset	1011 if similarity < 0 or similarity > 100:
6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37271 diff changeset	1012 raise error.Abort(_('similarity must be between 0 and 100'))
6942c73f0733 addremove: pass command-level similarity value down to scmutil.addremove() Yuya Nishihara <yuya@tcha.org> parents: 37271 diff changeset	1013 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	1014
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1015 ret = 0
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1016 join = lambda f: os.path.join(prefix, f)
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1017
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1018 wctx = repo[None]
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1019 for subpath in sorted(wctx.substate):
29802 35560189677c subrepo: cleanup of subrepo filematcher logic Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29771 diff changeset	1020 submatch = matchmod.subdirmatcher(subpath, m)
35560189677c subrepo: cleanup of subrepo filematcher logic Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29771 diff changeset	1021 if opts.get('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	1022 sub = wctx.sub(subpath)
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1023 try:
37269 14cd5290c4e6 addremove: remove dry_run, similarity from scmutil.addremove (API) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 37259 diff changeset	1024 if sub.addremove(submatch, prefix, opts):
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1025 ret = 1
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1026 except error.LookupError:
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1027 repo.ui.status(_("skipping missing subrepository: %s\n")
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1028 % join(subpath))
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1029
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1030 rejected = []
23534 83bbedc16b3f addremove: warn when addremove fails to operate on a named path Matt Harbison <matt_harbison@yahoo.com> parents: 23533 diff changeset	1031 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	1032 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	1033 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	1034 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	1035
25434 5984dd42e140 addremove: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25418 diff changeset	1036 badmatch = matchmod.badmatch(m, badfn)
5984dd42e140 addremove: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25418 diff changeset	1037 added, unknown, deleted, removed, forgotten = _interestingfiles(repo,
5984dd42e140 addremove: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25418 diff changeset	1038 badmatch)
18863 1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1039
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1040 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	1041 toprint = unknownset.copy()
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1042 toprint.update(deleted)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1043 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	1044 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	1045 if abs in unknownset:
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23582 diff changeset	1046 status = _('adding %s\n') % m.uipath(abs)
39088 ad88726d6982 addremove: add labels for messages about added and removed files Boris Feld <boris.feld@octobus.net> parents: 38856 diff changeset	1047 label = 'addremove.added'
18863 1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	1048 else:
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23582 diff changeset	1049 status = _('removing %s\n') % m.uipath(abs)
39088 ad88726d6982 addremove: add labels for messages about added and removed files Boris Feld <boris.feld@octobus.net> parents: 38856 diff changeset	1050 label = 'addremove.removed'
ad88726d6982 addremove: add labels for messages about added and removed files Boris Feld <boris.feld@octobus.net> parents: 38856 diff changeset	1051 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	1052
19152 7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1053 renames = _findrenames(repo, m, added + unknown, removed + deleted,
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1054 similarity)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1055
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1056 if not dry_run:
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1057 _markchanges(repo, unknown + forgotten, deleted, renames)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1058
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1059 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	1060 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	1061 return 1
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23534 diff changeset	1062 return ret
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	1063
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1064 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	1065 '''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	1066 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	1067 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	1068 rejected = []
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1069
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1070 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	1071
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1072 if repo.ui.verbose:
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1073 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	1074 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	1075 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	1076 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	1077 if abs in unknownset:
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1078 status = _('adding %s\n') % abs
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1079 else:
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1080 status = _('removing %s\n') % abs
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1081 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	1082
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1083 renames = _findrenames(repo, m, added + unknown, removed + deleted,
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1084 similarity)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1085
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1086 _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	1087
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1088 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	1089 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	1090 return 1
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1091 return 0
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	1092
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1093 def _interestingfiles(repo, matcher):
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1094 '''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	1095 about.
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1096
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1097 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	1098 whether files are modified or clean.'''
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1099 added, unknown, deleted, removed, forgotten = [], [], [], [], []
33649 377e8ddaebef pathauditor: disable cache of audited paths by default (issue5628) Yuya Nishihara <yuya@tcha.org> parents: 33542 diff changeset	1100 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	1101
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1102 ctx = repo[None]
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1103 dirstate = repo.dirstate
34343 255c761a52db dirstate: use keyword arguments to clarify walk()'s callers Martin von Zweigbergk <martinvonz@google.com> parents: 34327 diff changeset	1104 walkresults = dirstate.walk(matcher, subrepos=sorted(ctx.substate),
255c761a52db dirstate: use keyword arguments to clarify walk()'s callers Martin von Zweigbergk <martinvonz@google.com> parents: 34327 diff changeset	1105 unknown=True, ignored=False, full=False)
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1106 for abs, st in walkresults.iteritems():
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1107 dstate = dirstate[abs]
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1108 if dstate == '?' and audit_path.check(abs):
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1109 unknown.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1110 elif dstate != 'r' and not st:
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1111 deleted.append(abs)
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1112 elif dstate == 'r' and st:
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1113 forgotten.append(abs)
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1114 # for finding renames
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1115 elif dstate == 'r' and not st:
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1116 removed.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1117 elif dstate == 'a':
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1118 added.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	1119
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23142 diff changeset	1120 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	1121
19152 7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1122 def _findrenames(repo, matcher, added, removed, similarity):
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1123 '''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	1124 renames = {}
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1125 if similarity > 0:
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1126 for old, new, score in similar.findrenames(repo, added, removed,
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1127 similarity):
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1128 if (repo.ui.verbose or not matcher.exact(old)
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1129 or not matcher.exact(new)):
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1130 repo.ui.status(_('recording removal of %s as rename to %s '
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1131 '(%d%% similar)\n') %
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1132 (matcher.rel(old), matcher.rel(new),
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1133 score * 100))
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1134 renames[new] = old
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1135 return renames
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	1136
19153 9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1137 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	1138 '''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	1139 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	1140 wctx = repo[None]
27851 4133a306606c with: use context manager in _markchanges Bryan O'Sullivan <bryano@fb.com> parents: 27706 diff changeset	1141 with repo.wlock():
19153 9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1142 wctx.forget(deleted)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1143 wctx.add(unknown)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1144 for new, old in renames.iteritems():
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1145 wctx.copy(old, new)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	1146
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1147 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	1148 """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	1149 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	1150 """
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1151 origsrc = repo.dirstate.copied(src) or src
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1152 if dst == origsrc: # copying back a copy?
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1153 if repo.dirstate[dst] not in 'mn' and not dryrun:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1154 repo.dirstate.normallookup(dst)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1155 else:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1156 if repo.dirstate[origsrc] == 'a' and origsrc == src:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1157 if not ui.quiet:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1158 ui.warn(_("%s has not been committed yet, so no copy "
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1159 "data will be stored for %s.\n")
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1160 % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1161 if repo.dirstate[dst] in '?r' and not dryrun:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1162 wctx.add([dst])
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1163 elif not dryrun:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	1164 wctx.copy(origsrc, dst)
14482 58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	1165
24934 5abd0a76bc8f requires: move requires file writing func from localrepo to scmutil Drew Gottlieb <drgott@google.com> parents: 24755 diff changeset	1166 def writerequires(opener, requirements):
27706 22e362da27cf scmutil: use context managers for file handles Gregory Szorc <gregory.szorc@gmail.com> parents: 27651 diff changeset	1167 with opener('requires', 'w') as fp:
22e362da27cf scmutil: use context managers for file handles Gregory Szorc <gregory.szorc@gmail.com> parents: 27651 diff changeset	1168 for r in sorted(requirements):
22e362da27cf scmutil: use context managers for file handles Gregory Szorc <gregory.szorc@gmail.com> parents: 27651 diff changeset	1169 fp.write("%s\n" % r)
24934 5abd0a76bc8f requires: move requires file writing func from localrepo to scmutil Drew Gottlieb <drgott@google.com> parents: 24755 diff changeset	1170
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1171 class filecachesubentry(object):
20042 9a72d3886888 scmutil.filecacheentry: make stat argument to constructor mandatory Siddharth Agarwal <sid0@fb.com> parents: 20033 diff changeset	1172 def __init__(self, path, stat):
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1173 self.path = path
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1174 self.cachestat = None
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1175 self._cacheable = None
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1176
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1177 if stat:
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1178 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	1179
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1180 if self.cachestat:
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1181 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	1182 else:
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	1183 # 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	1184 self._cacheable = None
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1185
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1186 def refresh(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1187 if self.cacheable():
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1188 self.cachestat = filecachesubentry.stat(self.path)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1189
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1190 def cacheable(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1191 if self._cacheable is not None:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1192 return self._cacheable
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1193
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1194 # we don't know yet, assume it is for now
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1195 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1196
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1197 def changed(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1198 # no point in going further if we can't cache it
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1199 if not self.cacheable():
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1200 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1201
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	1202 newstat = filecachesubentry.stat(self.path)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1203
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1204 # 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	1205 if newstat and self._cacheable is None:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1206 self._cacheable = newstat.cacheable()
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1207
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1208 # check again
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1209 if not self._cacheable:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1210 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1211
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1212 if self.cachestat != newstat:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1213 self.cachestat = newstat
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1214 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1215 else:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1216 return False
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1217
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1218 @staticmethod
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1219 def stat(path):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1220 try:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1221 return util.cachestat(path)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25658 diff changeset	1222 except OSError as e:
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1223 if e.errno != errno.ENOENT:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1224 raise
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1225
20044 d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1226 class filecacheentry(object):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1227 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	1228 self._entries = []
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1229 for path in paths:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1230 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	1231
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1232 def changed(self):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1233 '''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	1234 for entry in self._entries:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1235 if entry.changed():
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1236 return True
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1237 return False
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1238
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1239 def refresh(self):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1240 for entry in self._entries:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1241 entry.refresh()
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	1242
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1243 class filecache(object):
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1244 """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	1245
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1246 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	1247 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	1248 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	1249
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1250 On subsequent access, the cached result is returned.
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1251
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1252 On external property set operations, stat() calls are performed and the new
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1253 value is cached.
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1254
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1255 On property delete operations, cached data is removed.
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1256
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1257 When using the property API, cached data is always returned, if available:
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1258 no stat() is performed to check if the file has changed and if the function
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1259 needs to be called to reflect file changes.
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1260
38676 3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1261 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	1262 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	1263 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	1264 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	1265 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	1266 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	1267 remove the ``filecacheentry``.
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1268 """
3b072388ca78 scmutil: rewrite docstring for filecache Gregory Szorc <gregory.szorc@gmail.com> parents: 38659 diff changeset	1269
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1270 def __init__(self, *paths):
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1271 self.paths = paths
16198 fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1272
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1273 def join(self, obj, fname):
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1274 """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	1275
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	1276 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	1277 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	1278 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	1279 """
31285 1937671105bc filecache: make 'join' abstract Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31217 diff changeset	1280 raise NotImplementedError
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1281
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1282 def __call__(self, func):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1283 self.func = func
37869 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1284 self.sname = func.__name__
73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1285 self.name = pycompat.sysbytes(self.sname)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1286 return self
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1287
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1288 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	1289 # 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	1290 if obj is None:
36fbd72c2f39 scmutil: allow access to filecache descriptor on class Martijn Pieters <mjpieters@fb.com> parents: 29367 diff changeset	1291 return self
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1292 # do we need to check if the file changed?
37869 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1293 if self.sname in obj.__dict__:
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	1294 assert self.name in obj._filecache, self.name
37869 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1295 return obj.__dict__[self.sname]
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1296
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1297 entry = obj._filecache.get(self.name)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1298
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1299 if entry:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1300 if entry.changed():
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1301 entry.obj = self.func(obj)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1302 else:
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1303 paths = [self.join(obj, path) for path in self.paths]
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1304
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1305 # 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	1306 # 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	1307 entry = filecacheentry(paths, True)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1308 entry.obj = self.func(obj)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1309
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1310 obj._filecache[self.name] = entry
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1311
37869 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1312 obj.__dict__[self.sname] = entry.obj
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	1313 return entry.obj
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1314
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1315 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	1316 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	1317 # 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	1318 # implies X in _filecache
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	1319 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	1320 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	1321 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	1322 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	1323 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	1324
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	1325 ce.obj = value # update cached copy
37869 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1326 obj.__dict__[self.sname] = value # update copy returned by obj.x
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1327
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1328 def __delete__(self, obj):
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1329 try:
37869 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1330 del obj.__dict__[self.sname]
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	1331 except KeyError:
37869 73a74f29eb87 scmutil: clean up bytes/string cache decorator mess on Python 3 again Augie Fackler <augie@google.com> parents: 37868 diff changeset	1332 raise AttributeError(self.sname)
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	1333
34456 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1334 def extdatasource(repo, source):
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1335 """Gather a map of rev -> value dict from the specified source
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1336
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1337 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: 34367 diff changeset	1338 for parsing the output from a shell command.
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1339
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1340 The data is parsed as a series of newline-separated records where
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1341 each record is a revision specifier optionally followed by a space
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1342 and a freeform string value. If the revision is known locally, it
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1343 is converted to a rev, otherwise the record is skipped.
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1344
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1345 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: 34367 diff changeset	1346 the local encoding. This allows uniformity between local and
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1347 remote data sources.
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1348 """
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1349
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1350 spec = repo.ui.config("extdata", source)
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1351 if not spec:
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1352 raise error.Abort(_("unknown extdata source '%s'") % source)
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1353
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1354 data = {}
34461 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1355 src = proc = None
34456 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1356 try:
34461 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1357 if spec.startswith("shell:"):
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1358 # 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: 34460 diff changeset	1359 cmd = spec[6:]
39836 f1d6021453c2 py3: remove a couple of superfluous calls to pycompat.rapply() Matt Harbison <matt_harbison@yahoo.com> parents: 39826 diff changeset	1360 proc = subprocess.Popen(procutil.tonativestr(cmd),
39826 c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 39777 diff changeset	1361 shell=True, bufsize=-1,
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37094 diff changeset	1362 close_fds=procutil.closefds,
39826 c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 39777 diff changeset	1363 stdout=subprocess.PIPE,
c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 39777 diff changeset	1364 cwd=procutil.tonativestr(repo.root))
34461 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1365 src = proc.stdout
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1366 else:
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1367 # treat as a URL or file
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1368 src = url.open(repo.ui, spec)
34460 910adadf08e8 extdata: just use iterator to read lines one by one Yuya Nishihara <yuya@tcha.org> parents: 34459 diff changeset	1369 for l in src:
34456 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1370 if " " in l:
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1371 k, v = l.strip().split(" ", 1)
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1372 else:
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1373 k, v = l.strip(), ""
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1374
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1375 k = encoding.tolocal(k)
34459 d5c5cc767b7e extdata: ignore ambiguous identifier as well Yuya Nishihara <yuya@tcha.org> parents: 34456 diff changeset	1376 try:
37360 d0d55980ffa7 extdatasource: use revsymbol() for converting to node Martin von Zweigbergk <martinvonz@google.com> parents: 37350 diff changeset	1377 data[revsingle(repo, k).rev()] = encoding.tolocal(v)
34459 d5c5cc767b7e extdata: ignore ambiguous identifier as well Yuya Nishihara <yuya@tcha.org> parents: 34456 diff changeset	1378 except (error.LookupError, error.RepoLookupError):
d5c5cc767b7e extdata: ignore ambiguous identifier as well Yuya Nishihara <yuya@tcha.org> parents: 34456 diff changeset	1379 pass # we ignore data for nodes that don't exist locally
34456 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1380 finally:
34461 c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1381 if proc:
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1382 proc.communicate()
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1383 if src:
c67db5dc131d extdata: use subprocess so we don't have to chdir() manually Yuya Nishihara <yuya@tcha.org> parents: 34460 diff changeset	1384 src.close()
35412 b1959391a088 extdata: abort if external command exits with non-zero status (BC) Yuya Nishihara <yuya@tcha.org> parents: 35308 diff changeset	1385 if proc and proc.returncode != 0:
b1959391a088 extdata: abort if external command exits with non-zero status (BC) Yuya Nishihara <yuya@tcha.org> parents: 35308 diff changeset	1386 raise error.Abort(_("extdata command '%s' failed: %s")
37463 bbd240f81ac5 procutil: make explainexit() simply return a message (API) Yuya Nishihara <yuya@tcha.org> parents: 37385 diff changeset	1387 % (cmd, procutil.explainexit(proc.returncode)))
34456 7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1388
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1389 return data
7757cc48b766 extdata: add extdatasource reader Matt Mackall <mpm@selenic.com> parents: 34367 diff changeset	1390
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	1391 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	1392 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	1393 raise error.LockInheritanceContractViolation(
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1394 'lock can only be inherited while held')
f0d730efb02f scmutil: add a way for a subprocess to be run with an inheritable lock Siddharth Agarwal <sid0@fb.com> parents: 26433 diff changeset	1395 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	1396 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	1397 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	1398 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	1399 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	1400
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	1401 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	1402 """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	1403
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	1404 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	1405 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	1406 subprocess."""
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	1407 return _locksub(repo, repo.currentwlock(), 'HG_WLOCK_LOCKER', cmd, *args,
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	1408 **kwargs)
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1409
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1410 class progress(object):
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1411 def __init__(self, ui, topic, unit="", total=None):
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1412 self.ui = ui
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1413 self.pos = 0
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1414 self.topic = topic
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1415 self.unit = unit
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1416 self.total = total
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1417
38374 800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38373 diff changeset	1418 def __enter__(self):
38503 077301ac69dc scmutil: fix __enter__ in progress context manager Danny Hooper <hooper@google.com> parents: 38456 diff changeset	1419 return self
38374 800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38373 diff changeset	1420
800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38373 diff changeset	1421 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: 38373 diff changeset	1422 self.complete()
800f5a2c869e progress: make the progress helper a context manager Martin von Zweigbergk <martinvonz@google.com> parents: 38373 diff changeset	1423
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1424 def update(self, pos, item="", total=None):
38419 6dea017eb6ba progress: enforce use of complete() on the helper class Martin von Zweigbergk <martinvonz@google.com> parents: 38374 diff changeset	1425 assert pos is not None
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1426 if total:
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1427 self.total = total
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1428 self.pos = pos
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1429 self._print(item)
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1430
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1431 def increment(self, step=1, item="", total=None):
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1432 self.update(self.pos + step, item, total)
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1433
38373 ef692614e601 progress: hide update(None) in a new complete() method Martin von Zweigbergk <martinvonz@google.com> parents: 38345 diff changeset	1434 def complete(self):
38419 6dea017eb6ba progress: enforce use of complete() on the helper class Martin von Zweigbergk <martinvonz@google.com> parents: 38374 diff changeset	1435 self.ui.progress(self.topic, None)
38373 ef692614e601 progress: hide update(None) in a new complete() method Martin von Zweigbergk <martinvonz@google.com> parents: 38345 diff changeset	1436
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1437 def _print(self, item):
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1438 self.ui.progress(self.topic, self.pos, item, self.unit,
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1439 self.total)
bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38331 diff changeset	1440
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1441 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	1442 """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	1443 """
dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1444 # experimental config: format.generaldelta
33238 784f2bd96d43 configitems: register the 'format.generaldelta' config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33088 diff changeset	1445 return (ui.configbool('format', 'generaldelta')
38759 f8cbff2184d7 sparse-revlog: also use sparse-revlog config as a general delta trigger Boris Feld <boris.feld@octobus.net> parents: 38676 diff changeset	1446 or ui.configbool('format', 'usegeneraldelta')
f8cbff2184d7 sparse-revlog: also use sparse-revlog config as a general delta trigger Boris Feld <boris.feld@octobus.net> parents: 38676 diff changeset	1447 or ui.configbool('format', 'sparse-revlog'))
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1448
26907 dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1449 def gddeltaconfig(ui):
dfab6edb98e3 format: introduce 'format.usegeneraldelta` Pierre-Yves David <pierre-yves.david@fb.com> parents: 26906 diff changeset	1450 """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	1451 """
26906 e40af07e518e scmutil: extract general delta config handling in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26836 diff changeset	1452 # experimental config: format.generaldelta
33238 784f2bd96d43 configitems: register the 'format.generaldelta' config Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33088 diff changeset	1453 return ui.configbool('format', 'generaldelta')
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1454
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1455 class simplekeyvaluefile(object):
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1456 """A simple file with key=value lines
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1457
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1458 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: 31419 diff changeset	1459 contain '\n' characters"""
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1460 firstlinekey = '__firstline'
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1461
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1462 def __init__(self, vfs, path, keys=None):
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1463 self.vfs = vfs
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1464 self.path = path
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1465
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1466 def read(self, firstlinenonkeyval=False):
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1467 """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: 32269 diff changeset	1468
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1469 '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: 32269 diff changeset	1470 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: 32269 diff changeset	1471 __firstline key."""
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1472 lines = self.vfs.readlines(self.path)
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1473 d = {}
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1474 if firstlinenonkeyval:
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1475 if not lines:
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1476 e = _("empty simplekeyvalue file")
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1477 raise error.CorruptedState(e)
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1478 # 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: 32269 diff changeset	1479 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: 32269 diff changeset	1480 del lines[0]
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1481
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1482 try:
32269 ed2c44741190 scmutil: add simplekeyvaluefile reading test Kostia Balytskyi <ikostia@fb.com> parents: 32172 diff changeset	1483 # the 'if line.strip()' part prevents us from failing on empty
ed2c44741190 scmutil: add simplekeyvaluefile reading test Kostia Balytskyi <ikostia@fb.com> parents: 32172 diff changeset	1484 # lines which only contain '\n' therefore are not skipped
ed2c44741190 scmutil: add simplekeyvaluefile reading test Kostia Balytskyi <ikostia@fb.com> parents: 32172 diff changeset	1485 # by 'if line'
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1486 updatedict = dict(line[:-1].split('=', 1) for line in lines
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1487 if line.strip())
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1488 if self.firstlinekey in updatedict:
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1489 e = _("%r can't be used as a key")
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1490 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: 32269 diff changeset	1491 d.update(updatedict)
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1492 except ValueError as e:
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1493 raise error.CorruptedState(str(e))
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1494 return d
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1495
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1496 def write(self, data, firstline=None):
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1497 """Write key=>value mapping to a file
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1498 data is a dict. Keys must be alphanumerical and start with a letter.
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1499 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: 32269 diff changeset	1500
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1501 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: 32269 diff changeset	1502 everything else, as it is, not in a key=value form"""
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1503 lines = []
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1504 if firstline is not None:
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1505 lines.append('%s\n' % firstline)
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1506
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1507 for k, v in data.items():
32270 218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1508 if k == self.firstlinekey:
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1509 e = "key name '%s' is reserved" % self.firstlinekey
218ca8526ec0 scmutil: make simplekeyvaluefile able to have a non-key-value first line Kostia Balytskyi <ikostia@fb.com> parents: 32269 diff changeset	1510 raise error.ProgrammingError(e)
35913 558e01a23f40 py3: slice on bytes to prevent getting the ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 35888 diff changeset	1511 if not k[0:1].isalpha():
31553 56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1512 e = "keys must start with a letter in a key-value file"
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1513 raise error.ProgrammingError(e)
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1514 if not k.isalnum():
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1515 e = "invalid key name in a simple key-value file"
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1516 raise error.ProgrammingError(e)
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1517 if '\n' in v:
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1518 e = "invalid value in a simple key-value file"
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1519 raise error.ProgrammingError(e)
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1520 lines.append("%s=%s\n" % (k, v))
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1521 with self.vfs(self.path, mode='wb', atomictemp=True) as fp:
56acc4250900 scmutil: add a simple key-value file helper Kostia Balytskyi <ikostia@fb.com> parents: 31419 diff changeset	1522 fp.write(''.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	1523
33541 b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1524 _reportobsoletedsource = [
33542 b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets Boris Feld <boris.feld@octobus.net> parents: 33541 diff changeset	1525 'debugobsolete',
33541 b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1526 'pull',
b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1527 'push',
b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1528 'serve',
b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1529 'unbundle',
b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1530 ]
b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1531
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1532 _reportnewcssource = [
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1533 'pull',
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1534 'unbundle',
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1535 ]
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1536
37762 7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1537 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	1538 """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	1539 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	1540 uses them."""
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1541 if match:
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1542 # 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	1543 # 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	1544 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	1545 else:
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1546 match = matchall(repo)
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1547
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1548 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	1549
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37709 diff changeset	1550 # a list of (repo, revs, match) prefetch functions
36137 f52a9336ac5f cmdutil: convert the prefetchfiles() hook to a callback mechanism (API) Matt Harbison <matt_harbison@yahoo.com> parents: 35913 diff changeset	1551 fileprefetchhooks = util.hooks()
f52a9336ac5f cmdutil: convert the prefetchfiles() hook to a callback mechanism (API) Matt Harbison <matt_harbison@yahoo.com> parents: 35913 diff changeset	1552
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1553 # 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: 35499 diff changeset	1554 _reportstroubledchangesets = True
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1555
33541 b47fef6d2365 transaction-summary: display the summary for all transactions Boris Feld <boris.feld@octobus.net> parents: 33511 diff changeset	1556 def registersummarycallback(repo, otr, txnname=''):
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33246 diff changeset	1557 """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	1558 """
34619 18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1559 def txmatch(sources):
18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1560 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	1561
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1562 categories = []
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1563
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1564 def reportsummary(func):
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1565 """decorator for report callbacks."""
35035 96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 35009 diff changeset	1566 # 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: 35009 diff changeset	1567 # 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: 35009 diff changeset	1568 # 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: 35009 diff changeset	1569 # 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: 35009 diff changeset	1570 # repository through the weakref.
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 35009 diff changeset	1571 filtername = repo.filtername
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 35009 diff changeset	1572 reporef = weakref.ref(repo.unfiltered())
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1573 def wrapped(tr):
34619 18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1574 repo = reporef()
35035 96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 35009 diff changeset	1575 if filtername:
96dcc78468e3 tr-summary: keep a weakref to the unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 35009 diff changeset	1576 repo = repo.filtered(filtername)
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1577 func(repo, tr)
35748 963a611b2f39 scmutil: 0-pad transaction report callback category Martin von Zweigbergk <martinvonz@google.com> parents: 35710 diff changeset	1578 newcat = '%02i-txnreport' % len(categories)
34620 b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1579 otr.addpostclose(newcat, wrapped)
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1580 categories.append(newcat)
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1581 return wrapped
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1582
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1583 if txmatch(_reportobsoletedsource):
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1584 @reportsummary
b799f11644d8 scmutil: factor out building of transaction summary callback Denis Laxalde <denis.laxalde@logilab.fr> parents: 34619 diff changeset	1585 def reportobsoleted(repo, tr):
34619 18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1586 obsoleted = obsutil.getobsoleted(repo, tr)
18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1587 if obsoleted:
18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1588 repo.ui.status(_('obsoleted %i changesets\n')
18309380fb88 scmutil: factor out transaction name lookup in registersummarycallback() Denis Laxalde <denis.laxalde@logilab.fr> parents: 34543 diff changeset	1589 % 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	1590
35710 5cd60b0587a8 evolution: make reporting of new unstable changesets optional Martin von Zweigbergk <martinvonz@google.com> parents: 35709 diff changeset	1591 if (obsolete.isenabled(repo, obsolete.createmarkersopt) and
5cd60b0587a8 evolution: make reporting of new unstable changesets optional Martin von Zweigbergk <martinvonz@google.com> parents: 35709 diff changeset	1592 repo.ui.configbool('experimental', 'evolution.report-instabilities')):
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1593 instabilitytypes = [
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1594 ('orphan', 'orphan'),
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1595 ('phase-divergent', 'phasedivergent'),
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1596 ('content-divergent', 'contentdivergent'),
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1597 ]
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1598
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1599 def getinstabilitycounts(repo):
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1600 filtered = repo.changelog.filteredrevs
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1601 counts = {}
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1602 for instability, revset in instabilitytypes:
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1603 counts[instability] = len(set(obsolete.getrevs(repo, revset)) -
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1604 filtered)
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1605 return counts
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1606
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1607 oldinstabilitycounts = getinstabilitycounts(repo)
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1608 @reportsummary
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1609 def reportnewinstabilities(repo, tr):
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1610 newinstabilitycounts = getinstabilitycounts(repo)
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1611 for instability, revset in instabilitytypes:
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1612 delta = (newinstabilitycounts[instability] -
1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1613 oldinstabilitycounts[instability])
38456 1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1614 msg = getinstabilitymessage(delta, instability)
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1615 if msg:
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1616 repo.ui.warn(msg)
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35499 diff changeset	1617
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1618 if txmatch(_reportnewcssource):
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1619 @reportsummary
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1620 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	1621 """Report the range of new revisions pulled/unbundled."""
39301 5763216ba311 transaction: remember original len(repo) instead of tracking added revs (API) Yuya Nishihara <yuya@tcha.org> parents: 39265 diff changeset	1622 origrepolen = tr.changes.get('origrepolen', len(repo))
39898 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1623 unfi = repo.unfiltered()
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1624 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	1625 return
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34645 diff changeset	1626
39897 a477679f6323 pullreport: skip filtered revs instead of obsolete ones Boris Feld <boris.feld@octobus.net> parents: 39894 diff changeset	1627 # Compute the bounds of new visible revisions' range.
a477679f6323 pullreport: skip filtered revs instead of obsolete ones Boris Feld <boris.feld@octobus.net> parents: 39894 diff changeset	1628 revs = smartset.spanset(repo, start=origrepolen)
39898 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1629 if revs:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1630 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	1631
39898 b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1632 if minrev == maxrev:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1633 revrange = minrev
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1634 else:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1635 revrange = '%s:%s' % (minrev, maxrev)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1636 draft = len(repo.revs('%ld and draft()', revs))
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1637 secret = len(repo.revs('%ld and secret()', revs))
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1638 if not (draft or secret):
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1639 msg = _('new changesets %s\n') % revrange
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1640 elif draft and secret:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1641 msg = _('new changesets %s (%d drafts, %d secrets)\n')
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1642 msg %= (revrange, draft, secret)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1643 elif draft:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1644 msg = _('new changesets %s (%d drafts)\n')
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1645 msg %= (revrange, draft)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1646 elif secret:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1647 msg = _('new changesets %s (%d secrets)\n')
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1648 msg %= (revrange, secret)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1649 else:
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1650 errormsg = 'entered unreachable condition'
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1651 raise error.ProgrammingError(errormsg)
b5e12039e6e0 pullreport: skip or rework some early return Boris Feld <boris.feld@octobus.net> parents: 39897 diff changeset	1652 repo.ui.status(msg)
35177 9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 35035 diff changeset	1653
39899 f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1654 # search new changesets directly pulled as obsolete
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1655 obsadded = unfi.revs('%d: and obsolete()', origrepolen)
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1656 cl = repo.changelog
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1657 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: 39898 diff changeset	1658 if extinctadded:
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1659 # 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: 39898 diff changeset	1660 # 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: 39898 diff changeset	1661 # exposed to users.
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1662 msg = '(%d other changesets obsolete on arrival)\n'
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1663 repo.ui.status(msg % len(extinctadded))
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets Boris Feld <boris.feld@octobus.net> parents: 39898 diff changeset	1664
38171 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1665 @reportsummary
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1666 def reportphasechanges(repo, tr):
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1667 """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: 38131 diff changeset	1668 pull/unbundle.
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1669 """
39301 5763216ba311 transaction: remember original len(repo) instead of tracking added revs (API) Yuya Nishihara <yuya@tcha.org> parents: 39265 diff changeset	1670 origrepolen = tr.changes.get('origrepolen', len(repo))
38171 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1671 phasetracking = tr.changes.get('phases', {})
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1672 if not phasetracking:
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1673 return
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1674 published = [
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1675 rev for rev, (old, new) in phasetracking.iteritems()
39301 5763216ba311 transaction: remember original len(repo) instead of tracking added revs (API) Yuya Nishihara <yuya@tcha.org> parents: 39265 diff changeset	1676 if new == phases.public and rev < origrepolen
38171 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1677 ]
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1678 if not published:
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1679 return
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	1680 repo.ui.status(_('%d local changesets published\n')
38171 eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1681 % len(published))
eb9835014d20 transaction-summary: show phase changes statistics in pull/unbundle Denis Laxalde <denis.laxalde@logilab.fr> parents: 38131 diff changeset	1682
38456 1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1683 def getinstabilitymessage(delta, instability):
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1684 """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: 38432 diff changeset	1685
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1686 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: 38432 diff changeset	1687 information like how to fix instabilities"""
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1688 if delta > 0:
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1689 return _('%i new %s changesets\n') % (delta, instability)
1cac2e8c7624 scmutil: move construction of instability count message to separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38432 diff changeset	1690
35184 bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35177 diff changeset	1691 def nodesummaries(repo, nodes, maxnumnodes=4):
bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35177 diff changeset	1692 if len(nodes) <= maxnumnodes or repo.ui.verbose:
bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35177 diff changeset	1693 return ' '.join(short(h) for h in nodes)
bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35177 diff changeset	1694 first = ' '.join(short(h) for h in nodes[:maxnumnodes])
35206 278f1feee73a scmutil: improve format pattern used in nodesummaries Boris Feld <boris.feld@octobus.net> parents: 35185 diff changeset	1695 return _("%s and %d others") % (first, len(nodes) - maxnumnodes)
35184 bc775b8cc020 scmutil: extra utility to display a reasonable amount of nodes Boris Feld <boris.feld@octobus.net> parents: 35177 diff changeset	1696
35185 66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1697 def enforcesinglehead(repo, tr, desc):
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1698 """check that no named branch has multiple heads"""
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1699 if desc in ('strip', 'repair'):
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1700 # skip the logic during strip
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1701 return
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1702 visible = repo.filtered('visible')
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1703 # possible improvement: we could restrict the check to affected branch
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1704 for name, heads in visible.branchmap().iteritems():
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1705 if len(heads) > 1:
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1706 msg = _('rejecting multiple heads on branch "%s"')
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1707 msg %= name
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1708 hint = _('%d heads: %s')
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1709 hint %= (len(heads), nodesummaries(repo, heads))
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1710 raise error.Abort(msg, hint=hint)
66ecde8a704d server: introduce a 'experimental.single-head-per-branch' option Boris Feld <boris.feld@octobus.net> parents: 35184 diff changeset	1711
35177 9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 35035 diff changeset	1712 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: 35035 diff changeset	1713 """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: 35035 diff changeset	1714 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: 35035 diff changeset	1715 """
9700cb9df140 convert: allow the sink object to be wrapped when the extension isn't loaded Matt Harbison <matt_harbison@yahoo.com> parents: 35035 diff changeset	1716 return sink
35496 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1717
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1718 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: 35412 diff changeset	1719 """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: 35412 diff changeset	1720 is passed.
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1721
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1722 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: 35412 diff changeset	1723 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: 35412 diff changeset	1724
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1725 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: 35412 diff changeset	1726 """
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1727 if not repo.filtername or not repo.ui.configbool('experimental',
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1728 'directaccess'):
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1729 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1730
35499 b55a142f00c5 scmutil: use a tuple of possible values instead of using startswith() Pulkit Goyal <7895pulkit@gmail.com> parents: 35496 diff changeset	1731 if repo.filtername not in ('visible', 'visible-hidden'):
35496 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1732 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1733
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1734 symbols = set()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1735 for spec in specs:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1736 try:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1737 tree = revsetlang.parse(spec)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1738 except error.ParseError: # will be reported by scmutil.revrange()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1739 continue
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1740
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1741 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: 35412 diff changeset	1742
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1743 if not symbols:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1744 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1745
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1746 revs = _getrevsfromsymbols(repo, symbols)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1747
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1748 if not revs:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1749 return repo
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1750
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1751 if hiddentype == 'warn':
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1752 unfi = repo.unfiltered()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1753 revstr = ", ".join([pycompat.bytestr(unfi[l]) for l in revs])
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1754 repo.ui.warn(_("warning: accessing hidden changesets for write "
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1755 "operation: %s\n") % revstr)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1756
35499 b55a142f00c5 scmutil: use a tuple of possible values instead of using startswith() Pulkit Goyal <7895pulkit@gmail.com> parents: 35496 diff changeset	1757 # 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: 35496 diff changeset	1758 # disbale these cache when revisions are dynamically pinned.
35496 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1759 return repo.filtered('visible-hidden', revs)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1760
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1761 def _getrevsfromsymbols(repo, symbols):
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1762 """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: 35412 diff changeset	1763 changesets present in symbols"""
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1764 revs = set()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1765 unfi = repo.unfiltered()
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1766 unficl = unfi.changelog
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1767 cl = repo.changelog
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1768 tiprev = len(unficl)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1769 allowrevnums = repo.ui.configbool('experimental', 'directaccess.revnums')
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1770 for s in symbols:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1771 try:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1772 n = int(s)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1773 if n <= tiprev:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1774 if not allowrevnums:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1775 continue
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1776 else:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1777 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: 35412 diff changeset	1778 revs.add(n)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1779 continue
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1780 except ValueError:
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1781 pass
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1782
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1783 try:
37868 69de3c3de036 directaccess: use resolvehexnodeidprefix() instead of _partialmatch() Martin von Zweigbergk <martinvonz@google.com> parents: 37865 diff changeset	1784 s = resolvehexnodeidprefix(unfi, s)
37094 7f025c9b7865 directaccess: do not abort by 'ff...' hash Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	1785 except (error.LookupError, error.WdirUnsupported):
35496 8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1786 s = None
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1787
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1788 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: 35412 diff changeset	1789 rev = unficl.rev(s)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1790 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: 35412 diff changeset	1791 revs.add(rev)
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1792
8bb90cc4668e scmutil: add utility fn to return repo object with user passed revs unhidden Pulkit Goyal <7895pulkit@gmail.com> parents: 35412 diff changeset	1793 return revs
38131 46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1794
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1795 def bookmarkrevs(repo, mark):
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1796 """
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1797 Select revisions reachable by a given bookmark
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1798 """
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1799 return repo.revs("ancestors(bookmark(%s)) - "
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1800 "ancestors(head() and not bookmark(%s)) - "
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1801 "ancestors(bookmark() and not bookmark(%s))",
46c2b19a1263 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs (API) David Demelier <markand@malikania.fr> parents: 37979 diff changeset	1802 mark, mark, mark)

Mercurial > public > mercurial-scm > hg

annotate mercurial/scmutil.py @ 39899:f9232b0310ef