Sun, 11 May 2014 00:49:35 +0900 fetch: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21406
fetch: use "getcommiteditor()" instead of explicit editor choice This patch also enhances "test-fetch.t", because "hg fetch" hasn't been explicitly tested around editor invocation and '--edit' option.
Sun, 11 May 2014 00:49:35 +0900 cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21405
cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor "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).
Wed, 14 May 2014 12:49:55 -0700 update: when deactivating a bookmark, print a message
Siddharth Agarwal <sid0@fb.com> [Wed, 14 May 2014 12:49:55 -0700] rev 21404
update: when deactivating a bookmark, print a message This helps prevent user confusion when innocent-seeming commands like 'hg update -C .' are run.
Thu, 02 Aug 2012 13:51:34 +0200 doc: improves merge-tools example with an overwrite of existing config
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 02 Aug 2012 13:51:34 +0200] rev 21403
doc: improves merge-tools example with an overwrite of existing config 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.
Mon, 12 May 2014 17:40:58 -0700 help: add additional information in the merge-tools section of config help
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 12 May 2014 17:40:58 -0700] rev 21402
help: add additional information in the merge-tools section of config help 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.
Wed, 07 May 2014 00:13:22 +0200 subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 07 May 2014 00:13:22 +0200] rev 21401
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice 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.
Wed, 07 May 2014 00:08:20 +0200 subrepo: add shortid() method to subrepo classes
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 07 May 2014 00:08:20 +0200] rev 21400
subrepo: add shortid() method to subrepo classes 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.
Tue, 11 Mar 2014 18:32:16 -0500 localrepo: call _dirstatestatus instead of duplicating logic
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:32:16 -0500] rev 21399
localrepo: call _dirstatestatus instead of duplicating logic
Tue, 22 Apr 2014 13:20:30 -0500 workingctx: call _dirstatestatus in status
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 13:20:30 -0500] rev 21398
workingctx: call _dirstatestatus in status Rip out the call from workingctx.status to localrepo.status.
Tue, 22 Apr 2014 13:14:51 -0500 context: add private _dirstatestatus method
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 13:14:51 -0500] rev 21397
context: add private _dirstatestatus method 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.
Tue, 11 Mar 2014 18:28:09 -0500 committablectx: move status to workingctx
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:28:09 -0500] rev 21396
committablectx: move status to workingctx This method was accidentally placed into the committablectx class. It contains logic for querying the dirstate so we move it to the correct class.
Tue, 11 Mar 2014 18:10:00 -0500 localrepo: factor out parentworking logic for comparing files
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:10:00 -0500] rev 21395
localrepo: factor out parentworking logic for comparing files 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.
Tue, 11 Mar 2014 17:44:09 -0500 localrepo: improve dirstate.normal lookup by cacheing the function
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 17:44:09 -0500] rev 21394
localrepo: improve dirstate.normal lookup by cacheing the function
Fri, 07 Mar 2014 13:32:37 -0800 localrepo: move symlink logic to workingctx
Sean Farley <sean.michael.farley@gmail.com> [Fri, 07 Mar 2014 13:32:37 -0800] rev 21393
localrepo: move symlink logic to workingctx
Fri, 09 May 2014 12:01:56 +0200 merge: separate worker functions for batch remove and batch get
Mads Kiilerich <madski@unity3d.com> [Fri, 09 May 2014 12:01:56 +0200] rev 21392
merge: separate worker functions for batch remove and batch get 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.
Tue, 22 Apr 2014 02:10:25 +0200 merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com> [Tue, 22 Apr 2014 02:10:25 +0200] rev 21391
merge: change debug logging - test output changes but no real changes 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.
Thu, 15 May 2014 02:14:59 +0200 merge: move constant assignments a bit and use them more
Mads Kiilerich <madski@unity3d.com> [Thu, 15 May 2014 02:14:59 +0200] rev 21390
merge: move constant assignments a bit and use them more
Fri, 02 May 2014 01:09:14 +0200 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com> [Fri, 02 May 2014 01:09:14 +0200] rev 21389
merge: change priority / ordering of merge actions 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.
Sat, 17 May 2014 00:47:42 -0700 run-tests: fix --interactive option
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 17 May 2014 00:47:42 -0700] rev 21388
run-tests: fix --interactive option ``TTest._testpath`` never existed. This must be the remain of some contributors side refactoring.
Sat, 17 May 2014 00:38:48 -0700 run-test: fix AttributeError in the --interactive prompt
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 17 May 2014 00:38:48 -0700] rev 21387
run-test: fix AttributeError in the --interactive prompt 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.
Sat, 17 May 2014 00:37:06 -0700 run-test: restore the -i prompt by write .err before checking if it exists
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 17 May 2014 00:37:06 -0700] rev 21386
run-test: restore the -i prompt by write .err before checking if it exists 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.
Sun, 20 Apr 2014 11:04:25 -0700 run-tests: move _gethgpath() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 11:04:25 -0700] rev 21385
run-tests: move _gethgpath() into TestRunner
Sun, 20 Apr 2014 10:34:52 -0700 run-tests: move string escaping to TTest
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:34:52 -0700] rev 21384
run-tests: move string escaping to TTest With this patch, TTest is almost fully self-contained and extractable. Only logging functions remain outside of its class.
Sun, 20 Apr 2014 10:28:35 -0700 run-tests: add some docstrings
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:28:35 -0700] rev 21383
run-tests: add some docstrings
Sun, 20 Apr 2014 10:24:00 -0700 run-tests: move createhgrc into Test
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:24:00 -0700] rev 21382
run-tests: move createhgrc into Test
Sun, 20 Apr 2014 10:19:58 -0700 run-tests: move SKIPPED_PREFIX and FAILED_PREFIX into TTest
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:19:58 -0700] rev 21381
run-tests: move SKIPPED_PREFIX and FAILED_PREFIX into TTest
Sun, 20 Apr 2014 10:16:36 -0700 run-tests: move SKIPPED_STATUS into Test class
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:16:36 -0700] rev 21380
run-tests: move SKIPPED_STATUS into Test class
Sun, 20 Apr 2014 10:14:25 -0700 run-tests: move parsehghaveoutput() into TTest
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:14:25 -0700] rev 21379
run-tests: move parsehghaveoutput() into TTest This patch starts a sequence of patches that will try to isolate everything related to t tests into the TTest class.
Sun, 20 Apr 2014 10:11:46 -0700 run-tests: make some methods of TestRunner internal
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:11:46 -0700] rev 21378
run-tests: make some methods of TestRunner internal
Sun, 20 Apr 2014 10:09:23 -0700 run-tests: eliminate main()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:09:23 -0700] rev 21377
run-tests: eliminate main()
Sun, 20 Apr 2014 10:08:33 -0700 run-tests: move option parser logic to TestRunner.run()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:08:33 -0700] rev 21376
run-tests: move option parser logic to TestRunner.run()
Sun, 20 Apr 2014 10:06:19 -0700 run-tests: move umask into TestRunner.run()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:06:19 -0700] rev 21375
run-tests: move umask into TestRunner.run() We now properly restore the umask as well, since run() tries to clean up after itself.
Sun, 20 Apr 2014 10:05:00 -0700 run-tests: move checktools into TestRunner.run()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:05:00 -0700] rev 21374
run-tests: move checktools into TestRunner.run()
Sun, 20 Apr 2014 10:04:15 -0700 run-tests: move test discovery into TestRunner.run()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:04:15 -0700] rev 21373
run-tests: move test discovery into TestRunner.run()
Sun, 20 Apr 2014 10:03:08 -0700 run-tests: move test shuffling and sorting into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:03:08 -0700] rev 21372
run-tests: move test shuffling and sorting into TestRunner
Sun, 20 Apr 2014 10:00:59 -0700 run-tests: assign testdir in TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 10:00:59 -0700] rev 21371
run-tests: assign testdir in TestRunner
Sun, 20 Apr 2014 09:59:01 -0700 run-tests: move hash seed logic to TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 09:59:01 -0700] rev 21370
run-tests: move hash seed logic to TestRunner
Sun, 20 Apr 2014 09:58:26 -0700 run-tests: move tmpdir calculations into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 09:58:26 -0700] rev 21369
run-tests: move tmpdir calculations into TestRunner
Sun, 20 Apr 2014 09:57:02 -0700 run-tests: move more path calculations into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 09:57:02 -0700] rev 21368
run-tests: move more path calculations into TestRunner
Sun, 20 Apr 2014 09:54:28 -0700 run-tests: move pypath manipulation into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 09:54:28 -0700] rev 21367
run-tests: move pypath manipulation into TestRunner
Sun, 20 Apr 2014 09:49:33 -0700 run-tests: establish TestRunner.run()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 09:49:33 -0700] rev 21366
run-tests: establish TestRunner.run() (amended by mpm to remove environ cleanup - unrelated change that breaks on Solaris)
Sun, 20 Apr 2014 09:44:39 -0700 run-tests: move program searching into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 09:44:39 -0700] rev 21365
run-tests: move program searching into TestRunner
Sun, 20 Apr 2014 09:40:27 -0700 run-tests: allow TestRunner to be passed into main()
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 09:40:27 -0700] rev 21364
run-tests: allow TestRunner to be passed into main() This allows 3rd parties to specify a custom TestRunner. This is useful for providing your own test discovery mechanism, for example.
Sun, 20 Apr 2014 00:23:06 -0700 run-tests: move test discovery logic into a function
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 00:23:06 -0700] rev 21363
run-tests: move test discovery logic into a function The new function is easily monkeypatchable. This facilitates more advanced test discovery by 3rd parties such as extensions.
Sun, 20 Apr 2014 00:12:26 -0700 run-tests: move scheduletests() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 00:12:26 -0700] rev 21362
run-tests: move scheduletests() into TestRunner
Sun, 20 Apr 2014 00:10:06 -0700 run-tests: move abort global to TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 00:10:06 -0700] rev 21361
run-tests: move abort global to TestRunner
Sun, 20 Apr 2014 00:06:30 -0700 run-tests: move runtests() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 00:06:30 -0700] rev 21360
run-tests: move runtests() into TestRunner
Sun, 20 Apr 2014 00:03:32 -0700 run-tests: move results global into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 20 Apr 2014 00:03:32 -0700] rev 21359
run-tests: move results global into TestRunner
Sat, 19 Apr 2014 23:59:06 -0700 run-tests: move times global into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:59:06 -0700] rev 21358
run-tests: move times global into TestRunner
Sat, 19 Apr 2014 23:53:23 -0700 run-tests: move gettest() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:53:23 -0700] rev 21357
run-tests: move gettest() into TestRunner
Sat, 19 Apr 2014 23:49:23 -0700 run-tests: move outputcoverage() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:49:23 -0700] rev 21356
run-tests: move outputcoverage() into TestRunner
Sat, 19 Apr 2014 23:47:59 -0700 run-tests: move outputtimes() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:47:59 -0700] rev 21355
run-tests: move outputtimes() into TestRunner
Sat, 19 Apr 2014 23:44:56 -0700 run-tests: move checkhglib into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:44:56 -0700] rev 21354
run-tests: move checkhglib into TestRunner
Sat, 19 Apr 2014 23:43:00 -0700 run-tests: move installhg() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:43:00 -0700] rev 21353
run-tests: move installhg() into TestRunner
Sat, 19 Apr 2014 23:39:38 -0700 run-tests: move createdfiles out of a global and into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:39:38 -0700] rev 21352
run-tests: move createdfiles out of a global and into TestRunner
Sat, 19 Apr 2014 23:38:10 -0700 run-tests: move usecorrectpython() into TestRunner
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 19 Apr 2014 23:38:10 -0700] rev 21351
run-tests: move usecorrectpython() into TestRunner
(0) -10000 -3000 -1000 -300 -100 -56 +56 +100 +300 +1000 +3000 +10000 +30000 tip