solaris: sed doesn't recognize a line without a newline

solaris: test cases can't use grep -a The -a option to GNU grep isn't available when using Solaris grep. Replace the one use of grep -a in the testsuite with some in-line Python that does the equivalent, and add a check for grep -a in check-code.py.

revlog: pass node as an argument of addrevision This change will allow revlog subclasses that override 'checkhash' method to use custom strategy of computing nodeids without overriding 'addrevision' method. In particular this change is necessary to implement manifest compression.

revlog: extract 'checkhash' method Extract method that decides whether nodeid is correct for paricular revision text and parent nodes. Having this method extracted will allow revlog subclasses to implement custom way of computing nodes. In particular this change is necessary to implement manifest compression.

histedit: discard meaningless comment about 'hexlify node' Refactoring in 26b41a902195 made this comment meaningless. The node gotten by "discovery.findcommonoutgoing()" is hexlified in "between()" by "repo.set('%n::%n', old, new)".

histedit: add description about "histedit --outgoing" to command help Before this patch, there is no explicit description that argument is treated as the URL of the destination repository when "--outgoing" is specified. This patch adds description about "histedit --outgoing" to command help of it.

histedit: add description about basic histedit function to command help Before this patch, there is no explicit description that histedit edits changesets between specified ancestor and the parent of the working directory: users may notice it by error message "REV is not an ancestor of working directory". This patch adds description about basic histedit function to command help of it. This patch uses term "ancestor" instead of "parent", because it seems to be more suitable, and almost all (error) messages already use it.

httpclient: import 0d1b0a8bc549 to fix bug involving late-arriving RST after a response After a day of hunting this defect, I'm now unable to reproduce the bug without this patch applied. Regardless, this should fix the problem I was observing with wireshark. Hopefully this fixes any flakiness in the buildbot from http2.

progress: stop getting stuck in a nested topic during a long inner step Convert, for example, has loops like this: for revision in source_repo: progress(revisions) for file in revision: progresss(file) Prior to this change, we would start showing the file-level progress when we encountered a big revision, and then we'd get stuck in showing file-progress instead of revision progress, often producing many many instantly-completing progress bars rather than the actually-helpful top-level revisions bar.

Backed out changeset 77d434760857

hgrc.d: separate namespace for mercurial scripts 9diff and 9mail

debugfs: add hardlink support reporting

obsolete: allow passing a revision to successorssets()

factotum: clean up keychain for multiple hg repository authentication

9mail: new script to add support for Plan 9 upas/marshal email wrapper

workingfilectx: inherit from basefilectx instead of filectx

basefilectx: move copies from filectx

basefilectx: move ancestors from filectx

basefilectx: move ancestor from filectx

basefilectx: move annotate from filectx

basefilectx: move p2 from filectx

basefilectx: move p1 from filectx

basefilectx: move parents from filectx

basefilectx: move cmp from filectx

basefilectx: move isbinary from filectx

basefilectx: move path from filectx

basefilectx: move changectx from filectx

basefilectx: move manifest from filectx

basefilectx: move phasestr from filectx

basefilectx: move phase from filectx

basefilectx: move extra from filectx

basefilectx: move branch from filectx

basefilectx: move description from filectx

basefilectx: move files from filectx

basefilectx: move date from filectx

basefilectx: move user from filectx

basefilectx: move hex from filectx We also change the function call to use the hex method of its change context so that it mirrors other such method calls.

basefilectx: move node from filectx

basefilectx: move linkrev from filectx

basefilectx: move rev from filectx

basefilectx: move filelog from filectx

basefilectx: move flags from filectx

basefilectx: move filenode from filectx

basefilectx: move filerev from filectx

basefilectx: move __ne__ from filectx

basefilectx: move __eq__ from filectx We also add type checking for extra protection.

basefilectx: move __hash__ from filectx

basefilectx: move __repr__ from filectx We change the hardcoded 'filectx' to instead use type(self).__name__ so that objects that inherit from basefilectx in the future will be able to use the same representation.

basefilectx: move __str__ from filectx

basefilectx: move __nonzero__ from filectx

basefilectx: move _repopath from filectx

basefilectx: move _filerev from filectx

basefilectx: move _filenode from filectx

basefilectx: move _changeid from filectx

basefilectx: move _filelog from filectx

basefilectx: add an empty class that will be used as a parent of file contexts Similar to the refactoring of context, we split common logic from filectx to a parent class called basefilectx that will be inherited by filectx, workingfilectx, and memfilectx. This will allow a clear disinction of all the file contexts: - filectx: read-only access to a filerevision that is already present in the repo, - workingfilectx: a filecontext that represents files from the working directory, - memfilectx: a filecontext that represents files in-memory

workingctx: inherit from basectx instead of changectx

largefiles: remove unnecessary check of instance The refactoring of all the context objects allows us to simply pass a basectx to the __new__ constructor and have it return the same object without allocating new memory. This also removes the need to import the context module.

localrepo: remove unnecessary check of instance The refactoring of all the context objects allows us to simply pass a basectx to the __new__ constructor and have it return the same object without allocating new memory.

basectx: remove unnecessary check of instance The refactoring of all the context objects allows us to simply pass a basectx to the __new__ constructor and have it return the same object without allocating new memory.

basectx: move dirty from changectx

basectx: move dirs from changectx

basectx: move _dirs from changectx

basectx: move diff from changectx

basectx: move match from changectx

basectx: move sub from changectx

basectx: move flags from changectx

basectx: move filenode from changectx

basectx: move _fileinfo from changectx

basectx: move p2 from changectx

basectx: move p1 from changectx

basectx: move parents from changectx

basectx: move mutable from changectx

basectx: move phasestr from changectx

basectx: move manifest from changectx

basectx: move __iter__ from changectx

basectx: move __getitem__ from changectx

basectx: move __contains__ from changectx

basectx: move substate from changectx

basectx: move __ne__ from changectx

basectx: move __eq__ from changectx We also add type checking for extra protection.

basectx: move __repr__ from changectx We change the hardcoded 'changectx' to instead use type(self).__name__ so that objects that inherit from basectx in the future will be able to use the same representation.

basectx: move __int__ from changectx

basectx: change _node to node() in hex This allows a child class to overload the node() function and still share the same code for hex().

basectx: move hex from changectx

basectx: move node from changectx

basectx: move rev from changectx

basectx: move __str__ from changectx

changectx: if passing a basectx then exit __init__ immediately

basectx: return a copied context if changeid is already a basectx This implements a copy constructor so that we can pass a basectx-derived object in future refactorings.

basectx: add an empty class that will be used as a parent of all contexts At the moment, there is no simple way to check if an object is a context because there is no common parent class. If there were, we could use 'isinstance' everywhere. Simply having memctx inherit from workingctx or changectx would allow the use of 'isinstance' but that could lead to some confusing situations of reading the code since we have three distinct concepts of a context: - changectx represents a changeset *already* in the repo, and is therefore immutable - workingctx represents changes on disk in the working directory - memctx represents changes solely in memory which may or may not be on disk Therefore, I propose refactoring context.py to have all three contexts inherit from a parent class 'basectx'.

ui.config: fix bug in config alternatives from cc669e4fec95

proxy: allow wildcards in the no proxy list (issue1821)

hgweb: cleaner if conditions in changelog() function This removes unneeded extra nesting level and extra variable, which makes the code easier to understand.

hgweb: separate search itself and template generation This will make it simpler to add other search modes.

paper: remove unused occurence of changelogtag in views This variably isn't passed to these views and it always renders to empty string for this reason. Other themes don't have this issue.