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.

hgweb: show full date in rfc822 format in tooltips at shortlog page The absolute date was not shown anywhere in the log view for users with enabled JavaScript.

hgweb: remove trailing whitespace in mercurial.js

paper: get rid of changelogtag template duplication

obsolete: clean up a couple of docstrings for correctness

run-tests: only check the common criteria once per test

merge with stable

Added signature for changeset f37b5a17e6a0

Added tag 2.7 for changeset f37b5a17e6a0

bookmarks: pull --update updates to active bookmark if it moved (issue4007) This makes `hg pull --update` behave the same wrt the active bookmark as `hg pull && hg update` does as of 2096e025a728. A helper function, bookmarks.calculateupdate, is added to prevent code duplication between postincoming and update.

merge with i18n

i18n-pt_BR: synchronized with 7b815e38022a

i18n-ja: synchronized with cfdae231ba78

histedit: don't clobber working copy on --abort if not on histedit cset Similar to issue4009, 2.7 will force people to abort histedits before doing interesting things. Without this fix, people with histedit sessions they wandered away from before upgrading to 2.7 could clobber their working copy for no reason.

rebase: allow aborting when descendants detected With this, all aborts will succeed in removing the state, rather than leaving the user in 'what do I do now?' limbo.

rebase: continue abort without strip for immutable csets (issue3997) This causes us to simply discard the rebase state.

rebase: don't clobber wd on --abort when we've updated away (issue4009)

bookmarks: update only proper bookmarks on push -r/-B (issue 3973) Make push -r/-B update only these bookmarks that point to pushed revisions or their ancestors, so we can be sure that commit pointed by bookmark is present in the remote reposiory. Previously push tried to update all shared bookmarks.

checklink: work around sshfs brain-damage (issue3636) With the follow_symlinks option, sshfs will successfully create links while claiming it encountered an I/O error. In addition, depending on the type of link, it may subsequently be impossible to delete the link via sshfs. Our existing link to '.' will cause sshfs to think the link is a directory, and thus cause unlink to give EISDIR. Links to non-existent names or circular links will cause the created link to not even be visible. Thus, we need to create a new temporary file and link to that. We'll still get a failure, but we'll be able to remove the link.

import: cut commit messages at --- unconditionally (issue2148) We used to do this based on X-mailer: mentioning git, but git doesn't put X-mailer in its git-format-patch output.

win32: update Inno Setup installer script and extensions list

revert: fix largefiles breakage

revert: make backup when unforgetting a file (issue3423) This skips the backup if it would be a duplicate.

revsingle: fix silly API issue (issue2992)

Added signature for changeset f0d7721d7322

Added tag 2.7-rc for changeset f0d7721d7322

i18n-it: do not translate rst syntax ".. container::" and ".. note::" are rst syntax and therefore must not be translated.

convert: handle changeset sorting errors without traceback (issue3961)

ancestor.deepest: ignore ninteresting while building result (issue3984) ninteresting indicates the number of non-zero elements in the interesting array, not the number of elements in the final list. Since elements in interesting can stand for more than one gca, limiting the number of results to ninteresting is an error. Tests for issue3984 are included.

ancestor.deepest: decrement ninteresting correctly (issue3984) The invariant this code tries to hold is that ninteresting is the number of non-zero elements in the interesting array. interesting[nsp] is incremented at the same time as interesting[sp] is decremented. So if interesting[nsp] was previously 0, ninteresting shouldn't be decremented.

ancestor.deepest: sort revs in C version This isn't strictly necessary, but it makes the code more consistent with the Python version.

check-code: add a check for the next() builtin, which was new in 2.6

mq: rename next() to nextpatch() to avoid confusing a future check-code patch next() is a builtin starting in 2.6, so it's also nice to avoid shadowing the builtin.

hgweb: replace next(revs) to revs.next() to fix compatibility with Python 2.5-

tests: glob out exception type for directory collision Got three different results on buildbot.

record: add checkunfinished support (issue3955)

checkunfinished: accommodate histedit quirk Turns out histedit actually intends for commits (but not other operations like update) to be possible during its operation.

tests: test-check-code-hg.t works for all files to check with xargs, backslashes are eaten up. Convert them to slashes therefore. This is only a problem with ls (on windows). hg manifest returns slashes. The pipe char is moved before the line end for telling check-code.py that sed does not modify the output.

check-code: do not abort on an unreadable file, only report this

heads: fix children/descendants in doc (issue3992)

paper: fix rendering of the first tab in a line in Webkit (issue3990) This fixes issue3990 for Webkit-browsers, and also older Opera versions. Rendering in firefox is not changed.