- May 10, 2014
-
-
Katsunori FUJIWARA authored
This patch also enhances "test-import-bypass.t" and "test-import.t", because "hg import" hasn't been explicitly tested around editor invocation and "--edit" option. This patch explicitly tests below: - with "--bypass" (regardless of "--edit"): - not invoked, if the patch contains the commit message - not invoked, if the commit message is explicitly specified - invoked, otherwise (just adding comment) - without "--bypass": - with "--edit": - not invoked, if "--no-commit" is not specified - invoked, otherwise - without "--edit": - not invoked, if the patch contains the commit message - not invoked, if "--message" or "--logfile" is specified (just adding comment) - invoked, otherwise
-
Katsunori FUJIWARA authored
This patch also enhances "test-graft.t", because "hg graft" hasn't been explicitly tested around editor invocation and "--edit" option.
-
Katsunori FUJIWARA authored
This patch doesn't change any tests like as preceding patches, because editor invocation is already tested in "test-commit-amend.t".
-
Katsunori FUJIWARA authored
This patch also eliminates "forceeditor" no more referred. This patch doesn't change any tests like as preceding patches, because editor invocation is already tested well.
-
Katsunori FUJIWARA authored
This patch also enhances "test-backout.t", because "hg backout" hasn't been explicitly tested around editor invocation and '--edit' option.
-
Katsunori FUJIWARA authored
Before this patch, "hg backout" examines "--message" and "--logfile" options explicitly. But this examination is redundant, because "commitfunc()" can receive the result of same examination by "cmdutil.logmessage()" in "cmdutil.commit()" through "message" argument. This patch avoids redundant message examination by "message" examination in "commitfunc()".
-
Katsunori FUJIWARA authored
This patch also enhances "test-transplant.t", because "hg transplant" hasn't been explicitly tested around editor invocation and "--edit" option.
-
Katsunori FUJIWARA authored
This patch also enhances "test-rebase-scenario-global.t", because "hg rebase" hasn't been explicitly tested around editor invocation and "--edit" option. In the other hand, this patch doesn't enhance tests in "hg rebase --collapse" case, because it is already tested in "test-rebase-collapse.t".
-
Katsunori FUJIWARA authored
This omits (redundant) adding "\n' to "message", because: - empty line is inserted by "commitforceeditor", if editor is invoked - tail white-spaces are stripped at storing into chaneglog, otherwise This patch also enhances "test-histedit-edit.t", because "hg histedit" hasn't been explicitly tested around editor invocation and "--continue" option.
-
Katsunori FUJIWARA authored
This patch doesn't change any tests like as preceding patches, because editor invocation is already tested in "test-histedit-fold.t".
-
Katsunori FUJIWARA authored
Before this patch, "hg histedit" for "message" uses "ui.edit()" for commit message editing. It shows original commit message, but not detail about the target revision: status of each modified/added/removed files, for example. This patch uses the editor gotten by "getcommiteditor()" instead of "ui.edit()" for "message" In "test-histedit-edit.t", this patch omits "fixbundle" invocation, because it prevents from confirming the "HG: added f" line in commit message by filtering " added " lines. Omiting "fixbundle" invocation causes that the exit code of "hg histedit" appears as one of command line: in this case, "hg histedit" is aborted by (expected) exception raising.
-
Katsunori FUJIWARA authored
This patch also enhances "test-fetch.t", because "hg fetch" hasn't been explicitly tested around editor invocation and '--edit' option.
-
Katsunori FUJIWARA authored
"getcommiteditor()" can simplify code paths to choose commit editor according to '--edit' option as below: before: editor = cmdutil.commiteditor # or editor = None/False if opts.get('edit'): editor = cmdutil.commitforceeditor after: editor = cmdutil.getcommiteditor(**opts) "getcommiteditor()" accepts option arguments not in "opts" style but in "**opts" style, because some code paths want to invoke it with just explicit "edit=True" argument (building dictionary is redundant).
-
- May 14, 2014
-
-
Siddharth Agarwal authored
This helps prevent user confusion when innocent-seeming commands like 'hg update -C .' are run.
-
- Aug 02, 2012
-
-
Pierre-Yves David authored
We highlight the fact that a user hgrc can overwrite the system wide preconfiguration. As other benefit we show priority value other than 1 and shows vimdiff configuration is usually directly available. This is valuable as vimdiff is (surprisingly) a common request from user.
-
- May 13, 2014
-
-
Pierre-Yves David authored
The merge tool configuration in general has always been a confusing topic for user. We add mention of: - possible pre-existing configuration, - way to look at it, - the more detailed help topic about how merge-tools configuration works. This should help users find they way.
-
- May 06, 2014
-
-
Angel Ezquerra authored
We were always using only the first 12 characters of the subrepo revision id when generating the "subrepo diverged" promptchoice. This is not necessarily correct for non mercurial subrepos.
-
Angel Ezquerra authored
This method takes an "id" (e.g. a revision id) and returns a "short" version (e.g. a short revision id). This will be used on the next revision to fix a small bug in the way that the text on the promptchoice shown when a subrepo diverges is generated.
-
- Mar 11, 2014
-
-
Sean Farley authored
-
- Apr 22, 2014
-
-
Sean Farley authored
Rip out the call from workingctx.status to localrepo.status.
-
Sean Farley authored
This patch is a step forward in getting rid of needing to check 'parentworking' throughout the status method. Eventually, we will use the power of inheritance to do the correct thing when comparing the working directory with its parent. This method is mostly a copy from localrepo.status. The custom status method of workingctx will eventually be absorbed by the refactoring of localrepo.status to context.status but unfortunately we can't do it in one step.
-
- Mar 11, 2014
-
-
Sean Farley authored
This method was accidentally placed into the committablectx class. It contains logic for querying the dirstate so we move it to the correct class.
-
Sean Farley authored
We will temporarily call a private method of the context class while we are in the process of removing the need of having localrepo.status.
-
Sean Farley authored
-
- Mar 07, 2014
-
-
Sean Farley authored
-
- May 09, 2014
-
-
Mads Kiilerich authored
The old code had one function that could do 2 different things. First, is was called a bunch of times to do one thing. Next, it was called a bunch of times to do the other thing. That gave unnecessary complexity and a dispatch overhead. Having separate functions is "obviously" better than having a function that can do two things, depending on its parameters. It also prepares the code for the next refactorings.
-
- Apr 22, 2014
-
-
Mads Kiilerich authored
Preparing for action list split-up, making sure the final change don't have any test changes. The patch moves debug statements around without really changing anything. Arguably, it temporarily makes the code worse. The only justification is that it makes it easier to review the test changes ... and in the end the big change will not change test output at all. The changes to test output are due to changes in the ordering of debug output. That is mainly because we now do the debug logging for files when we actually process them. Files are also processed in a slightly different but still correct order. It is now primarily ordered by action type, secondarily by filename. The patch introduces some redundancy. Some of it will be removed again, some of it will in the end help code readability and efficiency. It is possible that we later on could introduce a "process this action list and do some logging and progress reporting and apply this function". The "preserving X for resolve" debug statements will only have single space indentation. It will no longer have a leading single space indented "f: msg -> m" message. Having this message double indented would thus no longer make sense. The bid actions will temporarily be sorted using a custom sort key that happens to match the sort order the simplified code will have in the end.
-
- May 15, 2014
-
-
Mads Kiilerich authored
-
- May 01, 2014
-
-
Mads Kiilerich authored
The ordering of actions matters. Normal file system semantics is that files have to be removed before a directory with the same name can be created. Before the first ordering key was to have 'r' and 'f' actions come first, secondary key was the filename. Because of future refactorings we want to consistently have all action types (with a sensible priority) as separate first keys. Grouped by action type, we sort by filename. Not processing in strict filename order could give worse performance, especially on spinning disks. That is however primarily an issue in the cases where "all" actions are of the same kind and will be grouped together anyway.
-
- May 17, 2014
-
-
Pierre-Yves David authored
``TTest._testpath`` never existed. This must be the remain of some contributors side refactoring.
-
Pierre-Yves David authored
One must choose between ``"y yes".split()`` and ``('y', 'yes')``. I choose the later. The feature still crash when you answer "yes" to use it. But at least, the prompt itself works.
-
Pierre-Yves David authored
The `--interactive` flag workis by overwriting the original test file by its `.err` version. So we need to write it before calling `self.fail`. Otherwise the `.err` file does not exists and `--interactive` is ignored. We can move that block code around because it is dedicated to write changed output and we moves it in the try-except dedicated to handling changed output. Note that the flog is still badly broken after this change. But at least it crash instead of being ignored.
-
- Apr 20, 2014
-
-
Gregory Szorc authored
-
Gregory Szorc authored
With this patch, TTest is almost fully self-contained and extractable. Only logging functions remain outside of its class.
-
Gregory Szorc authored
-
Gregory Szorc authored
-
Gregory Szorc authored
-
Gregory Szorc authored
-
Gregory Szorc authored
This patch starts a sequence of patches that will try to isolate everything related to t tests into the TTest class.
-
Gregory Szorc authored
-