Bryan O'Sullivan <bryano@fb.com> [Sat, 09 Feb 2013 21:24:24 +0000] rev 18611
merge: rename p1 to wctx in manifestmerge
This is always a workingctx, and this name is more in line with other
functions in this module.
Na'Tosha Bard <natosha@unity3d.com> [Sat, 09 Feb 2013 16:02:01 +0000] rev 18610
largefiles: fix test and check code
Simon Heimberg <simohe@besonet.ch> [Sat, 03 Aug 2013 16:40:13 +0200] rev 18609
histedit: always abort with same message when working dir is wrong.
Using only one message makes live easier for translators. The clearer
error message was supposed by Augie Fackler.
Simon Heimberg <simohe@besonet.ch> [Sat, 03 Aug 2013 16:37:17 +0200] rev 18608
histedit: report when revisions to edit are not ancestors of working dir
Editing the history only is possible when the working dir is a descendant of
the revisions to edit. When this happens explain it by writing
abort: %s is not an ancestor of working directory
Bryan O'Sullivan <bryano@fb.com> [Sat, 09 Feb 2013 15:59:44 +0000] rev 18607
Merge
Siddharth Agarwal <sid0@fb.com> [Sat, 09 Feb 2013 15:36:00 +0000] rev 18606
manifestmerge: handle abort on local unknown, remote created files
This replaces the _checkunknown call in calculateupdates with a more
performant version. On a repository with over 150,000 files, this speeds up an
update by 0.6-0.8 seconds, which is up to 25%.
This does not introduce any UI changes. There is existing test coverage for
every case, mostly in test-merge*.t.
Siddharth Agarwal <sid0@fb.com> [Fri, 08 Feb 2013 15:23:23 +0000] rev 18605
manifestmerge: pass in branchmerge and force separately
This will be used in an upcoming patch.
Siddharth Agarwal <sid0@fb.com> [Sat, 09 Feb 2013 15:43:02 +0000] rev 18604
manifest: use a size 3 LRU cache to store parsed manifests
Previously, the manifest cache would store the last manifest parsed. We could
run into situations with operations like update where we would try parsing the
manifest for a revision r1, then r2, then r1 again. This increases the cache
size to 3 to avoid that bit of performance fragility.
Siddharth Agarwal <sid0@fb.com> [Sat, 09 Feb 2013 15:41:46 +0000] rev 18603
util: add an LRU cache dict
In certain cases we would like to have a cache of the last N results of a
given computation, where N is small. This will be used in an upcoming patch to
increase the size of the manifest cache from 1 to 3.
Kevin Bullock <kbullock@ringworld.org> [Sat, 09 Feb 2013 13:58:13 +0000] rev 18602
tests: remove last two check-code warnings about killdaemons
Removes the last of the warnings in test-check-code-hg.t introduced in
667063b22a69.
Kevin Bullock <kbullock@ringworld.org> [Sat, 09 Feb 2013 13:35:45 +0000] rev 18601
tests: guard against obsolete markers in the hg repo itself
If obsolete markers appear in the hg repo (because of enabling evolve),
then tests that run hg against the hg repo itself will see warnings like:
obsolete feature not enabled but 4 markers found!
As far as I can tell, this only occurs in test-check-code-hg.t -- in
particular, it will -not- show up on tests that run against test-created
repos, as most of the test suite does.
Na'Tosha Bard <natosha@unity3d.com> [Sat, 09 Feb 2013 15:08:21 +0000] rev 18600
largefiles: make caching largefiles message more explicit
In some cases, caching largefiles may take a long time (if the user has
pulled a lot of new heads). This patch makes it more clear what is happening,
by showing the number of heads we are caching largefiles for.
Na'Tosha Bard <natosha@unity3d.com> [Sat, 09 Feb 2013 15:25:46 +0000] rev 18599
largefiles: document behavior of caching largefiles for new heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Feb 2013 15:57:04 +0100] rev 18598
check-code: add Makefile target to run check-code
Augie Fackler <raf@durin42.com> [Sat, 09 Feb 2013 07:44:22 -0600] rev 18597
byterange: remove now-unused sys import
Augie Fackler <raf@durin42.com> [Sat, 09 Feb 2013 05:37:36 -0600] rev 18596
test-obsolete.t: migrate to killdaemons from kill `cat pidfile`