Tue, 12 Aug 2014 16:48:54 -0700 repoview: add caching bits
David Soria Parra <davidsp@fb.com> [Tue, 12 Aug 2014 16:48:54 -0700] rev 22150
repoview: add caching bits Add a caching infrastructure to cache hidden changesets. The cache tries to read the cache lazily and falls back to recomputing if no wlock can be obtain. To validate the cache we store a sha of the obstore content and repo heads in the beginning of the cache which we check every request.
Wed, 06 Aug 2014 13:26:04 -0700 repoview: split _gethiddenblockers
David Soria Parra <davidsp@fb.com> [Wed, 06 Aug 2014 13:26:04 -0700] rev 22149
repoview: split _gethiddenblockers Split up _gethiddenblockers into two categories: (1) "static' blockers that solely rely on the contents of obstore and are visible children of hidden changsets. (2) "dynamic" blockers, appearing by having wd parents, bookmarks or tags pointing to hidden changesets. We assume that (1) doesn't change often and can be easily cached with a good invalidation strategy. (2) change often, but barely produce blockers, so we can recompute them if necessary.
Tue, 12 Aug 2014 16:42:24 -0700 repoview: use set for blockers
David Soria Parra <davidsp@fb.com> [Tue, 12 Aug 2014 16:42:24 -0700] rev 22148
repoview: use set for blockers Blockers should be unique but tags and bookmarks could point to the same rev, therefore use a set to ensure that we don't have duplicates.
Wed, 13 Aug 2014 11:50:13 -0700 histedit: preserve initial author on fold (issue4296) stable
Martin von Zweigbergk <martinvonz@gmail.com> [Wed, 13 Aug 2014 11:50:13 -0700] rev 22147
histedit: preserve initial author on fold (issue4296) When the authorship of the changeset folded in does not match that of the base changeset, we currently use the configured ui.username instead. This is especially surprising when the user is not the author of either of the changesets. In such cases, the resulting authorship (the user's) is clearly incorrect. Even when the user is folding in a patch they authored themselves, it's not clear whether they should take over the authorship. Let's instead keep it simple and always preserve the base changeset's authorship. This is also how "git rebase -i" handles folding/squashing.
Wed, 13 Aug 2014 18:50:35 -0500 run-tests: fix some io ordering stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Aug 2014 18:50:35 -0500] rev 22146
run-tests: fix some io ordering backported from default
Wed, 13 Aug 2014 15:06:58 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Aug 2014 15:06:58 -0500] rev 22145
merge with stable
Wed, 25 Jun 2014 17:40:41 +0100 test-revert: add case where file is tracked but deleted in working directory
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 25 Jun 2014 17:40:41 +0100] rev 22144
test-revert: add case where file is tracked but deleted in working directory
Fri, 27 Jun 2014 18:25:19 +0200 test-revert: add case with untracked files with unique content
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:25:19 +0200] rev 22143
test-revert: add case with untracked files with unique content This test highlights similar misbehavior as its parent changesets.
Fri, 27 Jun 2014 18:23:45 +0200 test-revert: add case with untracked files with reverted content
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:23:45 +0200] rev 22142
test-revert: add case with untracked files with reverted content This test highlights similar misbehaviors as its parent changesets.
Fri, 27 Jun 2014 18:10:45 +0200 test-revert: add case where file exists but is untracked in working directory
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:10:45 +0200] rev 22141
test-revert: add case where file exists but is untracked in working directory This test highlights a small misbehavior in output when reverting to another revision not including the untracked file.
Fri, 27 Jun 2014 18:09:46 +0200 test-revert: add case where the file is marked as removed in the wc
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:09:46 +0200] rev 22140
test-revert: add case where the file is marked as removed in the wc Unlike untracked, the file is also missing from the working directory. This test highlights a small misbehavior in output when reverting to another revision.
Fri, 27 Jun 2014 18:08:16 +0200 test-revert: add case where wc content is different from "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:08:16 +0200] rev 22139
test-revert: add case where wc content is different from "base" and "parent" This test highlights a case where backups are not created and the user may lose data.
Fri, 27 Jun 2014 18:07:33 +0200 test-revert: add case where wc content is already reverted to base content
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:07:33 +0200] rev 22138
test-revert: add case where wc content is already reverted to base content This test highlights multiple misbehaviors of revert. We augment the test comments accordingly.
Fri, 27 Jun 2014 18:02:09 +0200 test-revert: add case where file exists neither in "base" nor in "parent"
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:02:09 +0200] rev 22137
test-revert: add case where file exists neither in "base" nor in "parent"
Fri, 27 Jun 2014 18:01:16 +0200 test-revert: add case where the file is removed between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:01:16 +0200] rev 22136
test-revert: add case where the file is removed between "base" and "parent"
Fri, 27 Jun 2014 18:00:49 +0200 test-revert: add case where file is unchanged between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 27 Jun 2014 18:00:49 +0200] rev 22135
test-revert: add case where file is unchanged between "base" and "parent" This test highlights a minor misbehavior in the message displayed during an explicit revert with a target revision.
Wed, 13 Aug 2014 14:05:08 -0500 test-run-tests: fix stdout/stderr io ordering stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Aug 2014 14:05:08 -0500] rev 22134
test-run-tests: fix stdout/stderr io ordering
Wed, 25 Jun 2014 17:37:13 +0100 test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 25 Jun 2014 17:37:13 +0100] rev 22133
test-revert: add case where file is added between "base" and "parent"
Tue, 12 Aug 2014 17:22:57 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 12 Aug 2014 17:22:57 -0500] rev 22132
merge with stable
Wed, 25 Jun 2014 17:31:53 +0100 test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 25 Jun 2014 17:31:53 +0100] rev 22131
test-revert: add methodical revert to "base" with explicit file path We now also test reverting file to another revision's content. However this differs from previously introduced test by using the explicit path of each "case file" when calling revert. This should result in the same result regarding file content and backup creation, but the output of the `hg revert` call should differ.
Wed, 25 Jun 2014 17:22:47 +0100 test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 25 Jun 2014 17:22:47 +0100] rev 22130
test-revert: add methodical revert with explicit file path We now also test reverting file to the working directory parent content. However this differs from the previously introduced test by using the explicit path of each "case file" when calling revert. This should result in the same result regarding file content and backup creation, but the output of the `hg revert` call should differ.
Wed, 25 Jun 2014 17:16:05 +0100 test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 25 Jun 2014 17:16:05 +0100] rev 22129
test-revert: add methodical revert to "base" We now also test reverting s file to the content of another revision. This is still done using the `--all` flag.
Wed, 25 Jun 2014 17:03:55 +0100 test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 25 Jun 2014 17:03:55 +0100] rev 22128
test-revert: add methodical revert to parent for working directory Now that we can automatically generate states, we need to actually run revert on them and check the result. While running such tests we are checking multiple elements. The output of the `hg revert` command, the resulting content of file, and the creation of backup file. The first practical test is using the simple case `hg revert --all`, reverting all files to working directory parent content.
Wed, 25 Jun 2014 17:24:18 +0100 test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 25 Jun 2014 17:24:18 +0100] rev 22127
test-revert: display the list of all generated cases This will help to track all existing cases. (still very simple now)
(0) -10000 -3000 -1000 -300 -100 -50 -24 +24 +50 +100 +300 +1000 +3000 +10000 tip