Fri, 14 Jul 2017 21:44:29 -0700 tests: rewrite test-rebase-detach.t using drawdag
Martin von Zweigbergk <martinvonz@google.com> [Fri, 14 Jul 2017 21:44:29 -0700] rev 33560
tests: rewrite test-rebase-detach.t using drawdag This makes it much clearer because each test case can have exactly the graph it wants (no extra cruft just because other tests want it). Differential Revision: https://phab.mercurial-scm.org/D94
Fri, 14 Jul 2017 23:09:17 -0700 tests: simplify config in test-rebase-detach.t
Martin von Zweigbergk <martinvonz@google.com> [Fri, 14 Jul 2017 23:09:17 -0700] rev 33559
tests: simplify config in test-rebase-detach.t Differential Revision: https://phab.mercurial-scm.org/D93
Fri, 14 Jul 2017 22:32:58 -0700 drawdag: include files from both parents in merge commits
Martin von Zweigbergk <martinvonz@google.com> [Fri, 14 Jul 2017 22:32:58 -0700] rev 33558
drawdag: include files from both parents in merge commits Consider a graph like this: D |\ B C |/ A drawdag will add a file called A in commit A, file B in B, file C in C. That's fine and expected. In merge commits like D, I would expect the files and their contents to be taken from the parent commits, so commit D in this example would have files A, B, and C. However, drawdag will instead add the file D compared to the first parent. Depending on whether B or C got a smaller nodeid, the contents of D would be {A, B, D} or {A, C, D}. This patch changes it to to be {A, B, C}. Differential Revision: https://phab.mercurial-scm.org/D92
Mon, 17 Jul 2017 15:54:15 -0700 gitweb: preserve whitespace in description
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 17 Jul 2017 15:54:15 -0700] rev 33557
gitweb: preserve whitespace in description Without this, multiple spaces or tabs in the commit message aren't preserved and things like tables don't align properly. As part of adding the CSS rule, we had to cuddle the content with the <div> to not introduce leading and trailing whitespace. The "addbreaks" filter was also removed because it would insert an additional newline, effectively double spacing content. Differential Revision: https://phab.mercurial-scm.org/D113
Mon, 17 Jul 2017 11:45:38 -0700 sparse: add a requirement when a repository uses sparse (BC)
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 17 Jul 2017 11:45:38 -0700] rev 33556
sparse: add a requirement when a repository uses sparse (BC) The presence of a sparse checkout can confuse legacy clients or clients without sparse enabled for reasons that should be obvious. This commit introduces a new repository requirement that tracks whether sparse is enabled. The requirement is added when a sparse config is activated and removed when the sparse config is reset. The localrepository constructor has been taught to not open repos with this requirement unless the sparse feature is enabled. It yields a more actionable error message than what you would get if the lockout were handled strictly at the requirements verification phase. Old clients that aren't sparse aware will see the generic "repository requires features unknown to this Mercurial" error, however. The new requirement has "exp" in its name to reflect the experimental nature of sparse. There's a chance that the eventual non-experimental feature won't change significantly and we could have squatted on the "sparse" requirement without ill effect. If that happens, we can teach new clients to still recognize the old name. But I suspect we'll sneak in some BC and we'll want a new requirement to convey new meaning. Differential Revision: https://phab.mercurial-scm.org/D110
Mon, 17 Jul 2017 11:21:23 -0700 sparse: consolidate common code for writing sparse config
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 17 Jul 2017 11:21:23 -0700] rev 33555
sparse: consolidate common code for writing sparse config In 3 functions we were writing the sparse config and updating the working directory. In two of them we had a transaction-like process for restoring the sparse config in case of wdir update fail. Because the pattern is common, we've already made mistakes, and the complexity will increase in the near future, let's consolidate the code into a reusable function. As part of this refactor, we end up reading the "sparse" file twice when updating it. This is a bit sub-optimal. But I don't think it is worth the code complexity to pass around the variables to avoid the redundancy. Differential Revision: https://phab.mercurial-scm.org/D109
Sat, 15 Jul 2017 15:51:57 -0700 revset: pass repo when passing ui
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 15 Jul 2017 15:51:57 -0700] rev 33554
revset: pass repo when passing ui The repo instance is currently only used to provide a changeset lookup function as part of parsing revsets. I /think/ this allows node fragments to resolve. I'm not sure why we wouldn't want this to always "just work" if parsing a revset string. Plus, an upcoming commit will introduce a new consumer that needs a handle on the repo. So passing it more often will make that code work more. Passing a repo instance in all callers of revset.match* results in a bunch of test changes. Notably, branch and tags caches get populated as part of evaluating revsets. I'm not sure if this is desirable. So this patch takes the conservative approach and only passes the repo if we're passing a ui instance. Differential Revision: https://phab.mercurial-scm.org/D97
Mon, 17 Jul 2017 13:22:59 -0500 win32: copy-edit debugssl messages to match prevailing style
Kevin Bullock <kbullock+mercurial@ringworld.org> [Mon, 17 Jul 2017 13:22:59 -0500] rev 33553
win32: copy-edit debugssl messages to match prevailing style
Sat, 15 Jul 2017 02:17:05 +0530 run-tests: make sure to check if pygments is installed before using it
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 15 Jul 2017 02:17:05 +0530] rev 33552
run-tests: make sure to check if pygments is installed before using it e80041832e introduced support to color the output of tests but used pygments without checking whether it's installed or not. That breaks test-run-tests.t for machines which don't have pygments installed. This patch conditionalize the color test in test-run-tests.t and also add a check to make sure pygments is installed before using that.
Sat, 15 Jul 2017 13:21:23 -0700 sparse: require [section] in sparse config files (BC)
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 15 Jul 2017 13:21:23 -0700] rev 33551
sparse: require [section] in sparse config files (BC) Previously, [include] was implicit and pattern lines before a [section] were added to includes. Because the format may change in the future and explicit behavior, well, more explicit, this commit changes the config parser to reject pattern lines that don't occur in a [section]. Differential Revision: https://phab.mercurial-scm.org/D96
Sat, 15 Jul 2017 13:07:57 -0700 sparse: use set for capturing profiles
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 15 Jul 2017 13:07:57 -0700] rev 33550
sparse: use set for capturing profiles Order doesn't need to be preserved. A set is acceptable. Differential Revision: https://phab.mercurial-scm.org/D95
Mon, 17 Jul 2017 12:38:07 -0400 util: remove dead code which used to be for old python2 versions
Alex Gaynor <agaynor@mozilla.com> [Mon, 17 Jul 2017 12:38:07 -0400] rev 33549
util: remove dead code which used to be for old python2 versions Differential Revision: https://phab.mercurial-scm.org/D107
Sat, 17 Jun 2017 20:10:22 +0530 status: add a flag to terse the output (issue4119)
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 17 Jun 2017 20:10:22 +0530] rev 33548
status: add a flag to terse the output (issue4119) This adds an experimental flag -t/--terse which will terse the output. The terse flag will respect other flags which filters the output. The flag takes a string whose value can be a subsequence of "marduic" (the order does not matter here.) Ignored files are not considered while tersing unless -i flag is passed or 'i' is there is the terse flag value. The flag is experimental for testing as there may be cases which will produce strange results with the flag. We can set the terse on by default by simply passing 'u' to the cmdutil.tersestatus(). This patch also adds a test file with tests covering the new feature.
Wed, 12 Jul 2017 16:10:10 +0530 commitextras: check the format of the arguments and no internal key is used
Pulkit Goyal <7895pulkit@gmail.com> [Wed, 12 Jul 2017 16:10:10 +0530] rev 33547
commitextras: check the format of the arguments and no internal key is used This patch adds check to make the arguments are passed as KEY=VALUE and no key which is used internally is passed. This patch also adds test for the extension.
Wed, 12 Jul 2017 00:23:45 +0530 commitextras: move fb extension to core which add extras to a commit
Pulkit Goyal <7895pulkit@gmail.com> [Wed, 12 Jul 2017 00:23:45 +0530] rev 33546
commitextras: move fb extension to core which add extras to a commit This patch moves the Facebook extension to add extra fields to a commit to a in-core extension.
Mon, 17 Jul 2017 00:49:29 -0400 archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com> [Mon, 17 Jul 2017 00:49:29 -0400] rev 33545
archive: add an experimental config to control the metadata file template Experimental because given the possible complexity, it may be worth figuring out how to load this from a file, similar to the style files for the log command, instead of trying to stuff it on the command line.
Sun, 16 Jul 2017 17:40:36 -0400 archive: use a templater to build the metadata file
Matt Harbison <matt_harbison@yahoo.com> [Sun, 16 Jul 2017 17:40:36 -0400] rev 33544
archive: use a templater to build the metadata file There are no visible changes here. I'm starting to wonder if adding the '+' to the 'node' line instead of a separate key line in 3047167733dc was the right thing to do. The '{node}' keyword never includes '+' elsewhere, and the way setup.py works, it would truncate it anyway. Additionally, the file is missing '{p2node}' when 'wdir()' merges are archived. I thought about adding an 'identify' line that would correspond to `hg id -n`. But the other nodes are the full 40 characters, and the output most useful for versioning is the short form. All of this cries out for customization via templating. (Although maybe having the short identify line by default is still a good idea.)
Sun, 16 Jul 2017 11:17:00 -0700 commandserver: do not handle EINTR for selector.select
Jun Wu <quark@fb.com> [Sun, 16 Jul 2017 11:17:00 -0700] rev 33543
commandserver: do not handle EINTR for selector.select selectors2 library handles EINTR transparently so we don't need to handle select.error ourselves.
Sun, 16 Jul 2017 02:33:14 +0200 debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net> [Sun, 16 Jul 2017 02:33:14 +0200] rev 33542
debugobsolete: also report the number of obsoleted changesets This seems useful to have the number of obsoleted changesets when calling debugobsolete.
Sun, 16 Jul 2017 02:20:06 +0200 transaction-summary: display the summary for all transactions
Boris Feld <boris.feld@octobus.net> [Sun, 16 Jul 2017 02:20:06 +0200] rev 33541
transaction-summary: display the summary for all transactions Now that we records "all" changes happening in a transaction (in tr.changes) we will be able to provide better report on various changes (phases turned public, changeset obsoleted, branch merged or created, etc..) This is far too late in the cycle to play with this, but having this existing method called more widely will help extensions to play around with various options during the 4.4 cycle. Instead of calling registersummarycallback only for transactions we want, we always call it and use the transaction name to decide when to report (eg: we do not want `hg amend` to report new obsoleted changesets). Filtering on transaction name does not seems great, but seems good enough for the moment. We can change the API during the next cycle. The previous manual call during unbundling of the bundle2 "obsmarkers" part is no longer necessary and has been dropped.
Sun, 16 Jul 2017 02:38:14 +0200 test-strip: fix call to super class in crashstriprepo
Boris Feld <boris.feld@octobus.net> [Sun, 16 Jul 2017 02:38:14 +0200] rev 33540
test-strip: fix call to super class in crashstriprepo The 'self' argument is already taken care of by the 'super(...)' call. Instead we were passing the repository instance as the 'desc' value. This got discovered by breaking the next changeset.
Sat, 15 Jul 2017 23:49:22 +0200 share: share 'cachevfs' with the source clone (issue5108)
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 23:49:22 +0200] rev 33539
share: share 'cachevfs' with the source clone (issue5108) Share extension now also share caches reads and writes. Not sharing caches results in costly caches recomputations which can takes up to minutes when using shares on large repositories. There are a couple of file in the '.hg/cache/' that depends of the current visibility. Visibility can be affected by the working copy location, something which is specific to each share. We ignores them for this series because they: * are the minority, * already have a good fallback to other precomputed caches, * are only affected when people use the experimental evolution feature.
Sat, 15 Jul 2017 23:05:15 +0200 cachevfs: add a devel warning for cache access though 'vfs'
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 23:05:15 +0200] rev 33538
cachevfs: add a devel warning for cache access though 'vfs' This will help third party extensions to migrate to the new 'cachevfs'.
Sat, 15 Jul 2017 23:30:25 +0200 cachevfs: migration the tags fnode cache to 'cachevfs'
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 23:30:25 +0200] rev 33537
cachevfs: migration the tags fnode cache to 'cachevfs' This will help sharing the cache between shares.
Sat, 15 Jul 2017 23:30:16 +0200 cachevfs: migrate tagscache to 'cachevfs'
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 23:30:16 +0200] rev 33536
cachevfs: migrate tagscache to 'cachevfs' This will help sharing the cache between shares.
Sat, 15 Jul 2017 22:42:50 +0200 cachevfs: migration the revbranchcache to 'cachevfs'
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 22:42:50 +0200] rev 33535
cachevfs: migration the revbranchcache to 'cachevfs' This will help sharing the cache between shares.
Sat, 15 Jul 2017 22:42:31 +0200 cachevfs: use the new vfs in when computing branchmap cache
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 22:42:31 +0200] rev 33534
cachevfs: use the new vfs in when computing branchmap cache This will help sharing the cache between shares.
Sat, 15 Jul 2017 23:05:04 +0200 cachevfs: add a vfs dedicated to cache
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 23:05:04 +0200] rev 33533
cachevfs: add a vfs dedicated to cache Most of the cache content lives in '.hg/cache/'. Moreover they are computed exclusively from data in the '.hg/store' directory. This creates issues with the share extension as the '.hg/store' directory is shared but the '.hg/cache' is not. On large repositories, this makes this prevent some usage of the share extension inefficient as some caches can take minutes to be recomputed. To improve the situation, we introduce a new 'cachevfs' that will be dedicated to cache reading and writing. In the next patches of this series, we'll migrate the 4 existing caches to it and update the share extension.
Sat, 15 Jul 2017 22:40:51 +0200 vfsward: register 'write with no lock' warnings as 'check-locks' config
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 22:40:51 +0200] rev 33532
vfsward: register 'write with no lock' warnings as 'check-locks' config Update 'write with no lock' warnings in order to be better controlled by the config. We reuse the option used for lock order for these other lock related message. The message can now be disabled using 'devel.check-locks = no' (in addition to the usual 'devel.all-warnings = no').
Sun, 16 Jul 2017 17:38:39 +0900 demandimport: prefer loaded module over package attribute (issue5617)
Yuya Nishihara <yuya@tcha.org> [Sun, 16 Jul 2017 17:38:39 +0900] rev 33531
demandimport: prefer loaded module over package attribute (issue5617) In general, the attribute of the same name is overwritten by executing an import statement. import a.b print(a.b.c) # 'c' of a/b/__init__.py from a.b.c import d print(a.b.c) # a/b/c.py However, this appears not true for the scenario described in the test case, and surprisingly, "from a.b.c import d" works even if "a.b.c" is not a module. This patch works around the problem by taking the right module from sys.modules if available.
Sun, 16 Jul 2017 17:19:22 +0900 demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org> [Sun, 16 Jul 2017 17:19:22 +0900] rev 33530
demandimport: drop Py3 workarounds from Py2 implementation
Sun, 16 Jul 2017 17:16:32 +0900 demandimport: drop hack for old Pythons which had no level argument
Yuya Nishihara <yuya@tcha.org> [Sun, 16 Jul 2017 17:16:32 +0900] rev 33529
demandimport: drop hack for old Pythons which had no level argument _import() was added by 868282fa29d8, but it is identical to _origimport() now.
Sun, 16 Jul 2017 17:47:10 +0900 tests: drop "absimport" conditionals which should be always true
Yuya Nishihara <yuya@tcha.org> [Sun, 16 Jul 2017 17:47:10 +0900] rev 33528
tests: drop "absimport" conditionals which should be always true
Sat, 15 Jul 2017 14:17:35 +0200 color: drop the now useless color extension
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 14:17:35 +0200] rev 33527
color: drop the now useless color extension all the extension features are provided by core since 4.2.
Sat, 15 Jul 2017 14:16:54 +0200 extensions: expand the builtins extensions declaration
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 14:16:54 +0200] rev 33526
extensions: expand the builtins extensions declaration This will future updates of the set cleaner and more readable.
Sat, 15 Jul 2017 20:31:52 +0200 debugextensions: drop the color from the test
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 20:31:52 +0200] rev 33525
debugextensions: drop the color from the test We are about to remove the extension so we remove trace of it in this specific test to prevent it to be confused.
Fri, 30 Jun 2017 03:30:13 +0200 configitems: register the 'bugzilla.notify' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:30:13 +0200] rev 33524
configitems: register the 'bugzilla.notify' config
Fri, 30 Jun 2017 03:44:56 +0200 configitems: register the 'ui.mergemarkertemplate' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:56 +0200] rev 33523
configitems: register the 'ui.mergemarkertemplate' config
Sat, 15 Jul 2017 14:14:53 +0200 configitems: register the 'ui.color' config
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 14:14:53 +0200] rev 33522
configitems: register the 'ui.color' config
Sat, 15 Jul 2017 14:14:46 +0200 color: drop the _enabledbydefault module variable
Boris Feld <boris.feld@octobus.net> [Sat, 15 Jul 2017 14:14:46 +0200] rev 33521
color: drop the _enabledbydefault module variable Since color is on by default, cleanup the now useless variable in both core and color extension.
Fri, 30 Jun 2017 03:44:45 +0200 configitems: register the 'ui.forcecwd' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:45 +0200] rev 33520
configitems: register the 'ui.forcecwd' config
Fri, 30 Jun 2017 03:44:43 +0200 configitems: register the 'ui.fallbackencoding' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:43 +0200] rev 33519
configitems: register the 'ui.fallbackencoding' config
Mon, 10 Jul 2017 21:49:37 +0200 bookmark: deprecate direct del of a bookmark value
Boris Feld <boris.feld@octobus.net> [Mon, 10 Jul 2017 21:49:37 +0200] rev 33518
bookmark: deprecate direct del of a bookmark value We want all bookmark deletion to go through 'applychanges', so lets deprecate legacy ways of doing bookmark deletion.
Mon, 10 Jul 2017 21:47:34 +0200 bookmark: deprecate direct set of a bookmark value
Boris Feld <boris.feld@octobus.net> [Mon, 10 Jul 2017 21:47:34 +0200] rev 33517
bookmark: deprecate direct set of a bookmark value We want all bookmark update to go through 'applychanges', so lets deprecate legacy ways of doing bookmark update.
Mon, 10 Jul 2017 20:26:53 +0200 bookmark: track bookmark changes at the transaction level
Boris Feld <boris.feld@octobus.net> [Mon, 10 Jul 2017 20:26:53 +0200] rev 33516
bookmark: track bookmark changes at the transaction level The transaction has now a 'bookmarks' dictionary in tr.changes. The structure of the dictionary is {BOOKMARK_NAME: (OLD_NODE, NEW_NODE)}. If a bookmark is deleted NEW_NODE will be None. If a bookmark is created OLD_NODE will be None. If the bookmark is updated multiple time, the initial value is preserved.
Mon, 10 Jul 2017 20:10:03 +0200 bookmark: deprecate 'recordchange' in favor of 'applychanges'
Boris Feld <boris.feld@octobus.net> [Mon, 10 Jul 2017 20:10:03 +0200] rev 33515
bookmark: deprecate 'recordchange' in favor of 'applychanges' Now that we have migrated all in-core caller of 'recordchange' to 'applychanges', deprecate 'recordchange' so external callers will move to the new unified method.
Mon, 10 Jul 2017 20:06:15 +0200 bookmark: drop deletedivergent
Boris Feld <boris.feld@octobus.net> [Mon, 10 Jul 2017 20:06:15 +0200] rev 33514
bookmark: drop deletedivergent It has no caller anymore.
Mon, 10 Jul 2017 20:02:32 +0200 bookmark: use 'divergent2delete' in checkconflict
Boris Feld <boris.feld@octobus.net> [Mon, 10 Jul 2017 20:02:32 +0200] rev 33513
bookmark: use 'divergent2delete' in checkconflict checkconflict used to also do some bookmark deletion in case of divergence. It is a bit suspicious given the function name, but it's not the goal of this series. In order to unify bookmarks changing, checkconflict now return the list of divergent bookmarks to clean up and the callers must clean them by calling applyphases.
(0) -30000 -10000 -3000 -1000 -300 -100 -48 +48 +100 +300 +1000 +3000 +10000 tip