Bryan O'Sullivan <bryano@fb.com> [Sat, 09 Feb 2013 21:24:36 +0000] rev 18612
merge: don't call copies.mergecopies unless we need to
This reduces the amount of time we spend calculating when doing a clean
non-merge update. In a large repo, the time dropped from 10.1 seconds
to 3.4.
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.