share: define norepo in command decorator

mq: define norepo in command decorator

largefiles: define norepo in command decorator

convert: define norepo in command decorator

commands: define norepo in command decorator

commands: add norepo argument to command decorator Since decorators are evaluated at module load time and since the @command decorator imports commands, the norepo variable (along with its friends) may not be declared yet. These variables are now declared before @command usage to ensure they are present.

cmdutil: better document command()

convert: update the transplant, rebase and graft references in 'extra' This change allows the origin() and destination() revsets to yield the same results in the new and old repos after a conversion. Previously, nothing would be listed for queries in the new repo. Like the SHA1 updates to the commit messages, this is only operational when the 'convert.hg.saverev=True' option is specified. If the old reference cannot be found, it is left as-is. It seems slightly better to leave stale evidence of the graft/transplant/rebase than to eliminate it entirely.

merge with stable

run-tests: hold iolock across diff/prompt when interactive Otherwise diff may get separated from the corresponding prompt by other threads. This required moving the interactive prompting from one helper method to another.

bookmarks: improve the bookmark help (issue4244)

push: restore contents of HG_URL for hooks (issue4268)

tests: ignore missing file with PYTHONDONTWRITEBYTECODE (issue4239)

hgweb: avoid initialization race (issue4280)

p4: accept changesets with no description (issue4282)

merge with stable

test-run-tests.t: test the --nodiff option

test-run-tests.t: test the --interactive option

run-tests: fixes the '--interactive' option error This patch fixes a regression recently introduced by a refactoring. Previously when failure occurs while testing with '--interactive' was enable, it didn't prompt user by asking whether he wants to accept this failure changes or not. This was happening beacuse of the 'if' condition if ret or not self._options.interactive or \ not os.path.exists(test.errpath): Everytime failure occurs, this condition gets true and returns back even when '--interactive' is enabled. This condition don't led the function to execute further, which consist the '--interactive' functionality. Now, on failure with '--interactive' enabled, it prompts user whether he wants to accepts failure changes or not. If yes then test gets passed and returns true, else test gets failed. On every failure, results gets stored in "self.failures.append((test, reason))" But if failure changes accepted by user then test must get "pop out" from failed test list.

run-tests: checks behaviour of test on failure while testing On failure while testing, if this function "result.addFailure(self, str(e))" returns true then test get 'passed' else count as 'failed'.

revlog: fix check-code error

merge with stable

revlog: hold a private reference to self._cache This keeps other threads from modifying self._cache out from under us. With this and the previous fix, 'hg serve' survives 100k hits with siege.

revlog: make _chunkcache access atomic With this and related fixes, 'hg serve' survived 100000 hits with siege.

tests: cat error messages are different on Solaris

error: restore python 2.4 compatibility for BundleValueError Under python 2.4, this: super(BundleValueError, self).__init__(msg) raises this: TypeError: super() argument 1 must be type, not classobj

i18n: explicitly decode paragraphs This was triggering an exception when the default encoding was disabled.

minirst: explicitly decode substitutions Caught by Augie and sys.setdefaultencoding("undefined")

test-run-tests.t: tests --jobs option

test-run-tests.t: test --debug option

test-run-tests.t: test selection of testfile from the command line

test-run-tests.t: tests the --retest option

run-tests: fixes the number of tests ran when '--retest' is enabled This patch fixes a regression recently introduced by a refactoring. (see 92a6b16c9186 and about 200 previous changesets from Gregory Szorc) While retesting, that is when '--retest' is enabled, only failure tests run and others either skipped or ignored. During retesting, "result.testsRun" holds the count of failure test that has run. But as while printing output, we have subtracted the skipped and ignored count from "result.testsRun". Therefore, to make the count remain the same, we need to add skipped and ignored count before printing.

run-tests: skipped test should not produce 'i' mark while retesting When '--retest' option is enabled then skipped test should not produce 'i' mark. This fixes a regression introduced by 92a6b16c9186 and about 200 previous changesets from Gregory Szorc.

test-run-tests.t: test running a failing test

run-tests: filter whitespace at end of error diffs Python 2.6 and 2.7 produce slightly different diff headers.

run-tests: produce '!' mark after running a failing test This patch fixes a regression recently introduced by a refactoring (see 92a6b16c9186 and about 200 previous changesets from Gregory Szorc). '!' mark denotes that the test gets failed while testing.

run-tests: produce error on running a failing test This patch fixes a regression recently introduced by a refactoring (see 92a6b16c9186 and about 200 previous changesets from Gregory Szorc). It produce an error message everytime with a test filename which gets fail while testing except at one condition when '--nodiff' option is enabled.

test-run-tests.t: test running a passing test

run-tests: don't check for the mercurial library used when using --with-hg In the ``--with-hg`` case, we cannot properly infer the location of the mercurial library, so we skip the warning completely.

test: introduce test-run-tests.t This testfile tests the test runner itself. There were multiple regressions in the last few weeks. Having tests would prevent this in the future.

tests: comment the main purpose of ``test-unified-test.t``

parsers.c: fix a couple of memory leaks

tests: rename ``test-run-tests.t`` to ``test-unified-test.t`` This ``test-run-tests.y`` is testing the unified test (.t) syntax interpretation, not really the run-tests.py command tool itself.

wireproto: rephrase the error message for unknown getbundle parameters In case of an unknown parameter passed to ``getbundle``, the server prints a message and ignores the parameter. This message was misleadingly prefixed with "abort: ". The use of "abort: " here is clearly wrong as nothing is actually aborted and the ``getbundle`` call proceeds without the parameter. The message is now prefixed with "warning: " and rephrased to make it clearer that the parameter was simply ignored.

patchbomb: reorder header insertions to clarify code This is done as its own change to make the changes to test-patchbomb.t easier to review.

patchbomb: always use message-id of first patch for series-id This currently has the side effect that the 0 of N message has no series-id. This won't matter for Mercurial's own use, but may be undesirable for other projects depending on their workflow. The way the header is inserted is intentionally a little funny to make the test expectation diff easier to review.

test-patchbomb: normalize glob lines and record their construction This makes it significantly less painful to use --interactive on run-tests, as you can now use the recorded regular expression substitutions to fix up the glob lines and produce zero diffs. This also tightens the expectations of a few of the lines for the MIME boundaries - it just seemed like the thing to do while in here and causing some changes.

patchbomb: includes a unique series ID in email header Now that we have patch index and series size information, having a unique series identifier will helps tool to glue all email back together without any additional logic.

color: add parenthesis to help readability Took me a multiple attempts until my mind eventually stop reading: auto = coloropt = 'auto' And properly reads: auto = colorpopt == 'auto' So we add parenthesis to clarify.

status: document the content of the returned tuple in the docstring The ``status`` function returns a lot of information. We document it.

resolve: fix grammar of no matching files message

merge with stable

bash_completion: add -l|--list support for shelve This was overlooked previously and found via 'hg shelve -p -l <tab>' (to show the diff of the shelved commit).

workingctx: duplicate status list received at _poststatus hook basectx.status may reorder the list after workingctx._poststatus is called, so workingctx must copy it. Otherwise, wctx.deleted() would return "unknown" files, for example.

patch: replace functions in fsbackend to use vfs Several functions in fsbackend are replaced to use vfs functions. vfs operations are applied on filename and path is joined by _join().

vfs: add unlinkpath to vfs This patch adds unlinkpath() function in vfs to replace util.unlinkpath().

shelve: add option combination tests for refactoring in succeeding patch

qfold: allow to specify '--message/'--logfile' and '--edit' at the same time Before this patch, 'hg qfold' disallows to specify '--message/'--logfile' and '--edit' at the same time. 'hg qfold' has disallowed such combination since Mercurial 0.9.2, but this restriction seems not to be reasonable for recent Mercurial, because all other commands creating new changeset allow it. This patch allows 'hg qfold' to specify '--message/'--logfile' and '--edit' at the same time like other commands creating new changeset.

qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time Before this patch, 'hg qrefresh' disallows to specify '--message/'--logfile' and '--edit' at the same time. 'hg qrefresh' has disallowed such combination since Mercurial 0.9.2, but this restriction seems not to be reasonable for recent Mercurial, because all other commands creating new changeset allow it. This patch allows 'hg qrefresh' to specify '--message/'--logfile' and '--edit' at the same time like other commands creating new changeset.

backout: accept '--edit' like other commands creating new changeset After this patch, users can invoke editor for the commit message by '--edit' option regardless of '--message'/'--logfile'.

gpg: accept '--edit' like other commands creating new changeset After this patch, users can invoke editor for the commit message by '--edit' option regardless of '--message'.

memfilectx: add a size method This method is needed to have memfilectx behave like the other file contexts. We can't just inherit this method because each file context has different behavior: filectx reads from the filelog, and workingfilectx reads from the disk. Therefore, we define memfilectx to return the size of the data in memory.

resolve: keep wlock while resolving This will make resolve use correct locking and thus make it more safe. Resolve is usually a long running command spending a lot of time waiting for user input on hard problems. It is thus a real world scenario to start multiple resolves at once or run other commands (such as up -C and merge) while resolve is running. Proper locking prevents that.

keyword: suppress keyword expansion while 'hg fetch' for internal merge Before this patch, 'hg fetch' may cause unexpected conflict, if 'hg fetch'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg fetch' for internal merge by adding 'fetch' to 'restricted' command list like 'merge'. This patch uses 'hg import' to safely create the new head to be merged at succeeding 'hg fetch', because: - branch of revision #10 is different from one of #11 in 'Test' repository, so just 'hg fetch -r 11' doesn't cause merging between them this means the new head should be created manually. - 'hg import' is easier and safer than 'cat <<EOF' and 'hg commit' to replay same changes including special characters like '$' safeness of 'hg import' with keyword extension is already examined in 'test-keyword.t'.

keyword: suppress keyword expansion while 'hg histedit' for internal merge Before this patch, 'hg histedit' may cause unexpected conflict, if 'hg histedit'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg histedit' for internal merge by adding 'histedit' to 'restricted' command list like 'merge'. Test in this patch just swaps order of revision #13 and #14: this is enough to cause internal merge.

keyword: suppress keyword expansion while 'hg backout' for internal merge Before this patch, 'hg backout' may cause unexpected conflict, if 'hg backout'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg backout' for internal merge by adding 'backout' to 'restricted' command list like 'merge'.

keyword: suppress keyword expansion while 'hg graft' for internal merge Before this patch, 'hg graft' may cause unexpected conflict, if 'hg graft'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg graft' for internal merge by adding 'graft' to 'restricted' command list like 'merge'.

keyword: suppress keyword expansion while 'hg rebase' for internal merge Before this patch, 'hg rebase' may cause unexpected conflict, if 'hg rebase'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg rebase' for internal merge by adding 'rebase' to 'restricted' command list like 'merge'. This patch specifies '--keep' to 'hg rebase', because revision #10 is useful also for tests in succeeding patches.

keyword: suppress keyword expansion while 'hg unshelve' for internal merge Before this patch, 'hg unshelve' may cause unexpected conflict, if 'hg unshelve'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg unshelve' for internal merge by adding 'unshelve' to 'restricted' command list like 'merge'.

merge with stable

Added signature for changeset 269c80ee5b3c

Added tag 3.0.1 for changeset 269c80ee5b3c

merge with i18n

localrepo: prevent leak of transaction object (issue4258) The onclose() closure added in cd443c7589cc held a regular reference to the transaction object. This was causing the transaction to not gc and a leak to occur. The closure now holds a reference to the weakref instance and the leak goes away.

i18n-ja: synchronized with 9e12579369f1

i18n-zh_TW: set Language header This avoids a warning from msgfmt: $ msgfmt -v -o mercurial/locale/zh_TW/LC_MESSAGES/hg.mo i18n/zh_TW.po -c i18n/zh_TW.po:7: warning: header field 'Language' still has the initial default value

i18n-de: translation improvement for gpg extension

bundlerepo: backout dbf292f65b09 According to foozy: This patch should be backed out, because "bundlename" and "bundle" in this case are not relative paths to the root of repositories. The former is specified via "hg incoming --bundle BUNDLENAME" (relative path to cwd, or absolute one), and the latter is generated in "changegroup.writebundle" by "tempfile.mkstemp" for internal temporary usage (absolute path). To be exact, the latter hunk in this patch can be applied, because "os.join" for two absolute paths can generate correct result. But the former hunk can't, because it may unexpected result, if specified path is relative to cwd and cwd != root.

merge: drop the quotes around commit description We already have a ":" after the user name to denote the start of the description. The current usage of quotes around the description is problematic as the truncation to 80 chars is likely to drop the closing quote. This may confuse syntax coloration in some editors.

memfilectx: remove path since it is now inherited

memfilectx: remove __str__ since it is now inherited

memfilectx: remove __nonzero__ since it is now inherited

memfilectx: call super.__init__ instead of duplicating code This patch changes the calling signature of memfilectx's __init__ to fall in line with the other file contexts. Calling code and tests have been updated accordingly.

memfilectx: inherit from committablefilectx This patch marks the beginning of having memfilectx become a full-fledged file contex so that we can handle diffing and merging.

memctx: remove parents since it is now inherited

memctx: remove flags since it is now inherited commitablectx has a much more robust implementation of flags() so we will use that instead of just blindly calling the flags function for the given path.

memctx: remove extra since it is now inherited

memctx: remove branch since it is now inherited

memctx: remove clean since it is now inherited

memctx: remove ignored since it is now inherited

memctx: remove unknown since it is now inherited

memctx: remove deleted since it is now inherited

memctx: remove removed since it is now inherited

memctx: remove added since it is now inherited

memctx: remove modified since it is now inherited

memctx: remove files since it is now inherited This is a slight change in definition from memctx returning only modified() but its parent's definition is more consistent with other contexts' behavior so we can call this change a slight bugfix and step in the right direction.

memctx: remove description since it is now inherited

memctx: remove date since it is now inherited

memctx: remove user since it is now inherited

memctx: remove p2 since it is now inherited

memctx: remove p1 since it is now inherited

memctx: remove __getitem__ since it is now inherited

memctx: remove __nonzero__ since it is now inherited

memctx: remove __int__ since it is now inherited

memctx: remove __str__ since it is now inherited

memctx: call super.__init__ instead of duplicating code

memctx: inherit from committablectx This patch marks the start of having memctx inherit from committablectx, thereby making it a full-fledged context that will eventually grow the ability to perform diffing and also merging.

committablectx: fix _manifest doc string

context: fix wrong indentation from renaming method

push: use bundle2 to push phases when available We now use a bundle2 container to push all phase updates at the same time. This is a significant step forward, even if further refactoring is needed to unify phase push with the changeset push.

pushkey: add an ``encode`` function This function is just a shorthand for ``encoding.fromlocal``. It will help hiding the encoding business from other code exchanging pushkey data over the wire.

bundle2: add ``pushkey`` support After ``listkeys`` we can now include ``pushkey`` request in a bundle2. The part uses a very simple scheme closest as possible to the current wireproto command for ``pushkey``. We may eventually decide for a more sophisticated part format before the protocol becomes final.

pushkey: add a ``decode`` function This function is just a shorthand for ``decoding.fromlocal``. It will help hiding the encoding business from other code exchanging pushkey data over the wire.

pull: when remote supports it, pull phase data alongside changesets We use bundle2 to retrieve the remote phase data at the same time as changesets. This reduces the amount of requestis and should improve consistency as the server can ensure nothing changed between the retrieval of those parts.

getbundle: support of listkeys argument when bundle2 is used A new ``listkeys`` is supported by getbundle. It is a list of namespaces whose content should be included in the bundle. An appropriate entry has been added to the wireproto map of getbundle arguments and a new bundle2 capability is advertised. There are still no codes that request such parts in core mercurial.

getbundle: raise error if extra arguments are provided for bundle10 New arguments are most likely to be supported by bundle20 (and above) only.

bundle: introduce a listkey handler This makes it possible to handle listkeys-related data stored in a bundle2. There are no producers yet.

pull: split remote phases retrieval from actual application We want to be able to retrieve phases information through bundle2. The logic to apply remote phases will not change.

wireproto: use pushkey.decodekey

pushkey: introduce an ``decodekeys`` function This function provides a standardized way to exchange pushkey content over the wire.

wireproto: use pushkey.encodekey

pushkey: introduce an ``encodekeys`` function This function provides a standardized way to exchange pushkey content over the wire.

bundle2: add more phase movement in the test To test phase exchange with bundle2 we need some phase movement to happen. Appropriate logging is added to track those changes.

bundle2: use non-publishing repo in test If we are going to test usage of bundle for phases exchange, we need some phase movements to be exchanged.

bundle2: use a smarter template for test We use a more compact template that includes phase information.

getbundle: declare type of parameters In addition to listing the expected options for ``getbundle``, we also list their types and handle the encoding/decoding automatically. This should make it easier for extensions to transmit additional information to getbundle.

bundle2: introduce a ``caps20to10`` function This function factors the creation of appropriate entries to use in ``bundlecaps`` argument of ``getbundle``. This cleans up code calling ``getbundle`` and helps its usage in more part of the code.

bundle2: introduce a bundle2caps function The process of decoding remote bundle2caps blob into a dictionary is cumbersome. We move it into a small helper function. This will clarify code that reads bundle2 capabilities of peers and helps using it in new places.

exchange: reinsert comment in the right place Unrelated new code was inserted between the original comment and the related code block.

docker: check for docker.io first

buildrpm: include release version in .tar.gz name Official releases are fully indentified by the version number, these builds are not. Specs are however traditionally not versioned.

buildrpm: remove prompt for uncommitted changes - it was a bad idea We want a command that is useful in scripts, not an interactive command.

buildrpm: collect code for building local hg and using it in one place

buildrpm: various minor cleanup

fix_bytes: loosen blacklist matching requirements On my Linux machine, paths seen by 2to3 include the build directory. We switch from an exact to substring match to allow 2to3 to work in more environments.

convert: only consider shamap revisions converted if they still exists Rollback or strip could leave a Mercurial repo with a shamap with revisions no longer in the repository. To ensure reliable conversions we now check that the commit actually exists and consider it non-existing if it doesn't exist.

convert: introduce hascommitfrommap sink method Mercurial has stable revision identifiers and rollback and strip. Revisions referenced in the shamap are thus not necessarily still present but we can easily check for it. Subversion do not have stable identifiers and no rollback or strip(?). We must thus assume that all revisions referenced from a shamap still must be present. This method is similar to hascommitforsplicemap but different ...

convert: rename sink hascommit to hascommitforsplicemap The name 'hascommit' sounds like something generic ... but it might also throw exceptions in specific cases and it is thus (apparently) only useful for splicemap.

tests: better tests for two-way convert

mergetools.hgrc: add minimal configuration for editmerge The ``editmerge`` script is shipped in contrib and opens an editor on every conflicting file. It needs minimal configuration to inject the config marker in the file before opening. Otherwise it behaves the same as ``internal:local`` and bad things happen.

merge with stable

convert: drastically speed up git conversions We would formerly exec git cat-file once for every commit, plus once for every tree and file we wnated to read. This switches to using git cat-file's batch mode, which is much, much, much faster. Using this new code, converting the git git repo to hg ran in 106 minutes on my machine. Using the stock mercurial, it required 1239 minutes. I believe this to be typical of the speedups we will see form this patch.

vim: use try catch in vim plugin to avoid conflicts

bundle2: raise BundleValueError error for stream level unsupported params This ensures both consistency and smooth propagation over the wire.

bundle2: support None parttype in BundleValueError This will be used for errors at the stream level.

bundle2: ignore advisory part with unknown parameters Advisory parts are advisory. If a handler exists but does not support the proper parameters, we can safely ignore it. Test has been updated to include this case.

bundle2: enforce all parameters in a part to be handled Once we picked a handler, we check that all mandatory parameter keys are properly supported. If not we raise an exception. We added a test for this case. The code now fails for any part with unknown mandatory parameters. We will ignore such errors for advisory parts in a later changeset.

bundle2: declare supported parameters for all handlers We now update all existing handlers with the supported parameters information.

bundle2: make it possible to declare params handled by a part handler If we are to enforce the mandatory aspect of parameter, we need a way to discover what a handler supports. The best option we end up with is this a simple declaration of known parameters at registration time. We simply plug the list of parameters on the function object because Python lets us do that and there is no benefit for a more complicated way. One of the handlers is updated for example and testing.

bundle2: support transmission of params error over the wire We picked a null character to split each parameter during the transfer. This is fragile if the same character is used in parameter name. However other codes will already behave in a strange way in that case, so we are not introducing any regression. A better format may be picked for the final version of the protocol.

bundle2: introduce a ``params`` attribute to BundleValueError We'll first use it for unsupported mandatory parameters on parts.

bundle2: introduce a parttype attribute to BundleValueError We will use the Exception for more that just unknown part type.

bundle2: rename b2x:error:unknownpart to b2x:error:unsupportedcontent This is a backward compatibility breakage per se. But bundle2 was explicitly flagged as experimental, and this is one an error path anyway. So the worse possible outcome from this change is to still have a crash but with a different message.

bundle2: move exception classes into the error module Exceptions should have known their place.

bundle2: rename UnknownPartError to BundleValueError We are going to raise exceptions for a wider range of cases: unsupported mandatory stream and part parameters. We rename the exception with a wider name.

context: explicitly return a tuple In the refactoring of removing localrepo.status, 2edb8648c500, we accidentally changed the return type from a tuple to a list. Philosophically, this is incorrect so we explicitly return a tuple again.

wireproto: expose the list of getbundle arguments to extensions For now, getbundle accepts a fixed number of arguments: ``heads``, ``common`` and ``bundlecaps``. We make this list exposed at the module level to let extensions add content there. This is important for extensions that wish to use bundle2 for other contents than changegroup.

run-tests: write .err files earlier Earlier refactoring of run-tests.py accidentally broke --interactive and external diff generation by not having .err files written before they are consulted. This patch fixes that.

run-tests: exit with non-0 exit code when tests fail or warn As part of the run-tests.py refactor, run-tests.py accidentally started exiting with 0 for most test runs. This patch restores the expected behavior.

bundle2: expose mandatory params in a mandatorykeys attribute We expose all keys that MUST be processed in ``part.mandatorykeys``. This makes it much easier to access the information. Enforcement of the mandatory parameters is coming in later changesets.

bundle2: use the new ``part.params`` dictionary We use the new ``part.params`` dictionary to access the value of parameters instead of creating one from the part's attributes.

bundle2: introduce a ``params`` dictionary on unbundled parts This exposes all parameters the part received into a ``part.params`` dictionary. This should be much easier to use. This dictionary itself does not expose the mandatory or advisory aspect of parameters, but no current users of bundle2 actually enforce any of this logic. Coming changesets will improve this aspect.

bundle2: make sure unbundled part param are read-only My old uncle Robert once trusted an API user. We never saw him again.

bundle2: introduce an ``_initparams`` method The handling of parameters will become much more sophisticated in the coming changesets. So we extract the logic in a function to not pollute the generic logic.

bundle2: forbid duplicate parameter keys No rules were specified about parameter key uniqueness. We document that keys should be unique and document it. This opens the way to a more friendly (read dictionary like) way to access value of parameters in the code.

bundle2: update part creators to ``addparam`` when relevant In some cases, the use of ``addparam`` makes code much clearer.

bundle2: introduce a ``addparam`` method on part We make it easier to add new parameters after the part creation. As for the ``data`` attribute we make sure the part generation has not begun yet.

bundle2: the ability to set ``data`` attribute of the part is now official We make it safe to set the data attribute after part creation. It is an allowed operation as long as the part has not started to be generated.

bundle2: introduce a ReadOnlyPartError exception As we will introduce functions to alter already created parts, we need a proper exception to raise when code tries to alter a part that cannot be altered anymore.

bundle2: warn about error during initialization in ``newpart`` docstring As we are moving toward being able to alter a part after its creation, we need to make the implication of the part being already part of the bundle2 clear.

bundle2: track life cycle of parts We introduce a ``_generated`` attribute on parts. Coming changesets will make it easier to update a part's contents after its creation. We need a way to track if the part is still open to modification or if it is currently being generated and should not be touched anymore. As a bonus, we can now detect and crash if someone manages to write bogus code to get a part generated twice.

bundle2: update all ``addpart`` callers to ``newpart`` The new method is what we want in all current cases.

bundle2: have ``newpart`` automatically add the part to the bundle The created part is automatically added to the bundle as this is most certainly the intent of the user code.

bundle2: add a ``newpart`` method to ``bundle20`` Creating new parts is the most common operation people do when exposed to a bundler. We create a dedicated method on the bundler object for it. This will simplify the code and also avoid having to import the ``mercurial.bundle2`` module in multiple places. One part creators have been updated for testing purpose.

bundle2: small doc update on the bundler The `bundle20` class contains methods to help define the content and methods to generate the actual stream. We add small doc headers to help distinguish between the two.

localrepo: replace status method with a shim The path of the righteous man is beset on all sides by the inequities of the selfish and the tyranny of evil men. Blessed is he, who in the name of charity and good will, shepherds the weak through the valley of darkness, for he is truly Mercurial's keeper and the finder of robust methods. And I will strike down upon thee with great vengeance and furious anger those who would attempt to poison and destroy Mercurial's codebase. And you will know my name is the Lord when I lay my vengeance upon thee.

workingctx: have status method call super instead of customized code. The old code is unneeded now that basectx has the ability to calculate the status between two context objects. Now, we use the objected oriented pattern called 'super'.

basectx: copy localrepo.status method Now that all the pieces are in place, we copy the status method from localrepo. In the next few patches, we will remove the old implementation.

committablectx: cache _status in _poststatus A future patch will remove the old workingctx.status which caches the status of the working directory, therefore we now cache this status in the poststatus hook of committablectx.

committablectx: simplify caching the status Previously, workingctx had custom variables for the unknown, ignored, and clean list of files of status. These then got moved to committablectx and, after the refactoring of localrepo.status, are no longer needed. We, therefore, simplify the whole mess. As a bonus, we are able to remove the need for having 'assert'.

localrepo: remove cache code now handled by _prestatus This patch removes the last of the 'working' variable that was sprinkled throughout localrepo.status which paves the way for future patches to use the object oriented design of contexts to handle calculating the status.

workingctx: add note about super._prestatus calling manifest

basectx: preserve loading the cached manifest in _prestatus This is just a copy from localrepo.status and is a small step to removing that method entirely. The prestatus hook is only called for changectx's, thereby ensuring that the same behavior is guaranteed.

localrepo: use new subrev method of context.py With the machinery in place, we use context.subrev instead of testing for a workingctx directly. This allows more flexibility for later patches that will add memctx to the mix.

committablectx: add subrev method to return None This allows a future patch to use object oriented style to remove an if statement in the status method.

basectx: add subrev method to return the rev of a subrepo given a subpath This will be used in an upcoming patch to simplify the status method by eliminating an if block.

merge with stable

bundle2: fix bundle2 pulling all revs on empty pulls When bundle2 was enabled, if hg pull had no commits to pull, it would print 'no changes found' and then download the entire repository from the server. This was caused by heads and common being set to None, which gets treated as heads=cl.heads() and common=[nullid], which means download the entire repo. Pulling bundles without a changegroup is a valid use case (like if we're just updating bookmarks), so this modifes the bundle code to allow not adding changegroups. This is backport of ab5040cd5749.

exchange: fix bad indentation Those two lines where double indented for no good reasons. This is backport of 71931b789424.

exchange: propagate arguments to the _getbundleextrapart function The arguments was wrongly propagated (again). This a backport of 0055b5b3eb9c

bundle2: fix configuration name mismatch During pulls bundle2 was checking server.bundle2, but during pushes it was checking experimental.bundle2. This makes them both experimental.bundle2. This is a backport of 750c7c14a637

discovery: if a push would create a new head, mention the bookmark name if any

revert: use p2 as parent when reverting against it revert was always using p1 as parent. This created some minor misbehavior when reverting against p2. See test change for an example of that. This is also a useful cleanup for coming refactoring to revert.

revert: explicitly get status against the parent This makes absolutely no functional changes. The default value for node1 is already the same as the current value of parent. But to be able to properly use the second parent in merge context, we have to start to be a bit more explicit about what we compute the status against.

revert: group related data in tuple in the dispatch table The dispatch table used to be: - action if in target manifest - action if not in target manifest - make backup if in target manifest - make backup if not in target manifest We turn this into two (action, make backup) tuples. This helps both readability of the dispatch table and handling of each case. This also prepares a refactoring where the different actions we performs, whether "file is in target manifest" or not, are determined before reaching this loop.

revert: group action into a single dictionary We had 4 different variables to hold the list of the 4 possibles actions. I'm grouping them in a single dictionary for a few reasons. First, it makes it clearer they are all related and meant to be the final actions performed by revert. Second this simplifies the parameter of the _performrevert function. Finally the two elements in each entry (list and message) have a different consumers in different functions, this change will make it easier to split them in a later commit.

revert: add some inline comments I spend some time understanding how this part of the revert code is working. I'm adding some comments to help the code readability. I expect most of them to disappear in a coming refactoring. But the refactoring should be easier to follow with the comment.

revert: cosmetic align of the dispatch table This changeset make a minimal cosmetic change to help readability of the value in this table.

revert: add a test case to reverting "add" during merges This kind of revert is specifically trickier since the file is reported as "modified" by status. This case was only tested by some largefiles test. We introduce proper testing of all aspects of this case in the revert tests themselves.

alias: change return code of bad definition to 255 We use 255 for general command error. It can't raise util.Abort because help module executes badalias command to get error message.

bookmarks: properly align multi-byte characters

tests: fix cut and paste error on encoding alignment test

alias: handle shlex error in command aliases No command should fail with ValueError just because there is unparseable alias definition. It returns 1 like other badalias handlers, but should be changed to 255 in a later version because we use 255 for general command error.

subrepo: normalize path in the specific way for problematic encodings Before this patch, "reporelpath()" uses "rstrip(os.sep)" to trim "os.sep" at the end of "parent.root" path. But it doesn't work correctly with some problematic encodings on Windows, because some multi-byte characters in such encodings contain '\\' (0x5c) as the tail byte of them. In such cases, "reporelpath()" leaves unexpected '\\' at the beginning of the path returned to callers. "lcalrepository.root" seems not to have tail "os.sep", because it is always normalized by "os.path.realpath()" in "vfs.__init__()", but in fact it has tail "os.sep", if it is a root (of the drive): path normalization trims tail "os.sep" off "/foo/bar/", but doesn't trim one off "/". So, just avoiding "rstrip(os.sep)" in "reporelpath()" causes regression around issue3033 fixed by fccd350acf79. This patch introduces "pathutil.normasprefix" to normalize specified path in the specific way for problematic encodings without regression around issue3033.

subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos Before this patch, sanitizing ".hg/hgrc" scans directories and files also in meta data area for non-hg subrepos: under ".svn" for Subversion subrepo, for example. This may cause not only performance impact (especially in large scale subrepos) but also unexpected removing meta data files. This patch avoids sanitizing ".hg/hgrc" in meta data area for non-hg subrepos. This patch stops checking "ignore" target at the first (case-insensitive) appearance of it, because continuation of scanning is meaningless in almost all cases.

subrepo: make "_sanitize()" take absolute path to the root of subrepo Before this patch, "hg update" doesn't sanitize ".hg/hgrc" in non-hg subrepos correctly, if "hg update" is executed not at the root of the parent repository. "_sanitize()" takes relative path to subrepo from the root of the parent repository, and passes it to "os.walk()". In this case, "os.walk()" expects CWD to be equal to the root of the parent repository. So, "os.walk()" can't find specified path (or may scan unexpected path), if CWD isn't equal to the root of the parent repository. Non-hg subrepo under nested hg-subrepos may cause same problem, too: CWD may be equal to the root of the outer most repository, or so. This patch makes "_sanitize()" take absolute path to the root of subrepo to sanitize correctly in such cases. This patch doesn't normalize the path to hostile files as the one relative to CWD (or the root of the outer most repository), to fix the problem in the simple way suitable for "stable". Normalizing should be done in the future: maybe as a part of the migration to vfs.

subrepo: invoke "_sanitize()" also after "git merge --ff" Before this patch, sanitizing ".hg/hgrc" in git subrepo doesn't work, when the working directory is updated by "git merge --ff". "_sanitize()" is not invoked after checking target revision out into the working directory in this case, even though it is invoked indirectly via "checkout" (or "rawcheckout") in other cases. This patch invokes "_sanitize()" explicitly also after "git merge --ff" execution.

subrepo: make "_sanitize()" work "_sanitize()" was introduced by 224e96078708 on "stable" branch, but it has done nothing for sanitizing since 224e96078708. "_sanitize()" assumes "Visitor" design pattern: "os.walk()" should invoke specified function ("v" in this case) for each directory elements under specified path but "os.walk()" assumes "Iterator" design pattern: callers of it should drive loop to scan each directory elements under specified path by themselves with the returned generator object Because of this mismatching, "_sanitize()" just discards the generator object returned by "os.walk()" and does nothing for sanitizing. This patch makes "_sanitize()" work. This patch also changes the format of warning message to show each unlinked files, for multiple appearances of "potentially hostile .hg/hgrc".

vfs: add lexists() in current api lexists is added in current API of vfs.

bundlerepo: update unlink in getremotechanges to use vfs As per WindowsUTF8 plan, unlink from getremotechanges is updated to use vfs in this change.

docker: update package target to packages/

packaging: move output directory from build/ to packages/ setuptools owns build/ and dist/ and we want to have our own scheme

make: add a basic osx mpkg target

setup: make Xcode 5.1 check less specific Was failing on "5.1\n".

merge with stable

alias: fix loss of non-zero return code in command aliases This also includes test for shell aliases. It avoid using "false" command because "man false" does not say "exit with 1" but "exit with a status code indicating failure."

exchange: drop dead code This code have been factorised and moved in its own function by 7d0bbb6dd730. We actually read the result of this other computation in the very line before the deleted block. I somehow forgot to remove the original code, but it is now dead. Good bye duplicated computation.

exchange: fix indentation level

import: add --partial flag to create a changeset despite failed hunks The `hg import` command gains a `--partial` flag. When specified, a commit will always be created from a patch import. Any hunk that fails to apply will create .rej file, same as what `hg qimport` would do. This change is mainly aimed at preserving changeset metadata when applying a patch, something very important for reviewers. In case of failure with `--partial`, `hg import` returns 1 and the following message is displayed: patch applied partially (fix the .rej files and run `hg commit --amend`) When multiple patches are imported, we stop at the first one with failed hunks. In the future, someone may feel brave enough to tackle a --continue flag to import.

update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.

merge: fix stupid indentation left over from previous refactorings

Merge with stable

revsetbenchmark: support for running on other repo We add a -R/--repo option to run the benchmarks on another repository. This is very useful as some repository are bigger/more interesting than the mercurial one.

revsetbenchmark: automatically finds the perf extension Before this changeset, you had to stand in the root of the mercurial repo to run the `revsetbenchmark.py` script. Otherwise, the perf extension would not be found a `./contrib/perf.py` and the script would crash in panic. We now figure out the contrib directory from the location of this script. This makes it possible to run the script from other location that the mercurial repo root (but you still need to be in the core mercurial repository)

bundle2: make sure standard stream are binary Python on Windows apparently use encoded stream by default. We use the same trick than elsewhere in the code to make them binary. This should fix the current buildbot failure on windows.

revset-benchmark: add max(::(tip~20) - obsolete()) This revset is used in evolve. The new revset lazyness should make it all faster but in practice it is significantly slower. Below is a timing for this entry on my Mercurial repo. 2.9.2) ! wall 0.034598 comb 0.040000 user 0.040000 sys 0.000000 (best of 100) 3.0+@) ! wall 0.062268 comb 0.060000 user 0.060000 sys 0.000000 (best of 100) The ~20 have been taken arbitrary.

merge: use separate lists for each action type This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.

changelog: ensure changelog._delaybuf is initialized The ``localrepo.writepending`` method is using the ``changelog._delaybuff`` attribute to know if it has anything to do. However the ``changelog._delaybuff`` is never initialised at ``__init__`` time. This can lead to crash when using bundle2 for part that never touch the changelog. We simply initialize it to its base value. This is scheduled for stable as it both trivial and blocking for experimenting with bundle2.

proxy: remove unneeded _set_hostport for compatibility with Python 2.7.7rc1 With Python 2.7.7rc1, "hg pull" through HTTP CONNECT tunnel fails due to the removal of _set_hostport [1]. ... File "mercurial/url.py", line 372, in https_open return self.do_open(self._makeconnection, req) ... File "mercurial/url.py", line 342, in connect _generic_proxytunnel(self) File "mercurial/url.py", line 228, in _generic_proxytunnel self._set_hostport(self.host, self.port) AttributeError: httpsconnection instance has no attribute '_set_hostport' self._set_hostport(self.host, self.port) should be noop and can be removed because: - _set_hostport() [2] was the function to parse "host:port" string and set them to self.host and self.port, - and (self.host, self.port) pair should be valid since connect() is called prior to _generic_proxytunnel(). [1]: http://hg.python.org/cpython/rev/568041fd8090 [2]: http://hg.python.org/cpython/file/3a1db0d2747e/Lib/httplib.py#l721

bugzilla: support Bugzilla 4.4.3+ API login token authentication (issue4257) Bugzilla 4.4.3 and later remove the old cookie based session authentication from the Web Services API and replace it with a login token. The session can now also be restricted to the originating IP. Add the necessary to the extension so it works with 4.4.3 and later.

resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.

templates: fix ifcontains against sets with length > 1 (issue4259) Previously the ifcontains revset was checking against the set using a pure __contains__ check. It turns out the set was actually a list of formatted strings meant for ui output, which meant the contains check failed if the formatted string wasn't significantly different from the raw value. This change makes it check against the raw data, prior to it being formatted.

run-tests: assign value to ESCAPEMAP - dict.update do not return self a36cc85a5b7b did more than what the description said and introduced a bug.

run-tests: fix invalid reference to stringescape after a36cc85a5b7b

update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.

run-tests: add docstrings

run-tests: avoid duplicate code in vlog()

run-tests: make attributes of TestRunner internal There is little reason for the data members of TestRunner to be public, as they are implementation details. Enforce it through naming.

run-tests: make testdir an argument of TestSuite.__init__ With this change, TestSuite no longer accesses anything on TestRunner and the TestRunner is no longer passed to TestSuite.