Siddharth Agarwal <sid0@fb.com> [Fri, 29 Mar 2013 19:54:06 -0700] rev 18851
pull: list bookmarks before pulling changesets (issue3873)
Consider a bookmark B that exists both locally and remotely. If B is updated
remotely, and then a pull is performed where the pull set contains the new
location of B, the bookmark is updated locally. However, if remote B is
updated in the middle of a pull to a location not in the pull set, the
bookmark won't be updated locally at all.
To fix this, list bookmarks before pulling in changesets, not after. This
still leaves a race open if B gets moved in between listing bookmarks and
pulling in changesets, but the race window is much smaller. Fixing the race
properly would require a bundle format upgrade.
test-hook.t's output changes because we no longer do two listkeys calls during
pull, just one.
test-pull-http.t's output changes because we now search for bookmarks before
searching for changes.
Siddharth Agarwal <sid0@fb.com> [Fri, 29 Mar 2013 19:52:02 -0700] rev 18850
test-hook.t: remove prelistkeys.forbid hook before moving on
An upcoming patch will change the order of operations and perform a listkeys
before a changegroup fetch. This will cause a few tests to print out the wrong
error message.
Siddharth Agarwal <sid0@fb.com> [Fri, 29 Mar 2013 18:28:59 -0700] rev 18849
bookmarks.updatefromremote: rename local rb to remotemarks
This local will become a parameter in an upcoming patch, so give it a more
descriptive name. The name stays similar to the existing localmarks.
Siddharth Agarwal <sid0@fb.com> [Fri, 29 Mar 2013 19:06:23 -0700] rev 18848
pull: rename local rb to remotebookmarks
This local will become more important in an upcoming patch, so give it a more
descriptive name.
Siddharth Agarwal <sid0@fb.com> [Fri, 29 Mar 2013 16:07:57 -0700] rev 18847
dicthelpers: inline diff and join code
mpm suggested this change since it improves performance slightly.
Benchmarking hg perfcalculate -r .
Before:
! wall 0.141173 comb 0.140000 user 0.140000 sys 0.000000 (best of 66)
After:
! wall 0.138619 comb 0.140000 user 0.140000 sys 0.000000 (best of 69)
Siddharth Agarwal <sid0@fb.com> [Fri, 29 Mar 2013 15:23:19 -0700] rev 18846
dicthelpers: add docstrings for diff and join
Bryan O'Sullivan <bryano@fb.com> [Mon, 01 Apr 2013 13:46:32 -0700] rev 18845
perf: add perfdirs command
This measures the cost of computing the dirstate's dirs structure,
which becomes very expensive in a large working directory.
Matt Mackall <mpm@selenic.com> [Mon, 01 Apr 2013 15:19:16 -0500] rev 18844
merge with stable
Nikolaj Sjujskij <sterkrig@myopera.com> [Fri, 29 Mar 2013 18:45:07 -0700] rev 18843
zsh_completion: fix trailing carriage return spoiling tag completion
This was giving the following error:
% hg up 2.5-r<Tab>
(eval):1: bad substitution
% hg up 2.5-r
Matt Mackall <mpm@selenic.com> [Fri, 29 Mar 2013 16:48:32 -0700] rev 18842
filesets: add eol predicate
Matt Mackall <mpm@selenic.com> [Fri, 29 Mar 2013 15:27:33 -0700] rev 18841
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 29 Mar 2013 15:27:11 -0700] rev 18840
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 01 Mar 2013 11:54:36 -0300] rev 18839
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2013 03:25:19 +0900] rev 18838
i18n-ja: synchronized with 61c8327ced50
Bryan O'Sullivan <bryano@fb.com> [Thu, 28 Mar 2013 18:21:20 -0700] rev 18837
perf: remove mysterious trailing newlines