churn: define inferrepo in command decorator

commands: define inferrepo in command decorator

cmdutil: support inferrepo in command decorator

keyword: define optionalrepo in command decorator

commands: define optionalrepo in command decorator

cmdutil: add optionalrepo argument to command decorator

tests: define norepo in command decorator

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.