Augie Fackler <augie@google.com> [Tue, 22 Sep 2015 14:13:07 -0400] rev 26296
debian: install hg-ssh to /usr/bin just like downstream
Yuya Nishihara <yuya@tcha.org> [Sun, 20 Sep 2015 20:13:27 +0900] rev 26295
highlight: remove temporary hack to overwrite repo.getcwd
Now hgweb does it globally.
Yuya Nishihara <yuya@tcha.org> [Sun, 20 Sep 2015 20:11:31 +0900] rev 26294
hgweb: overwrite cwd to resolve file patterns relative to repo (issue4568)
It's useless to handle file patterns as relative to the cwd of the server
process. The only sensible way in hgweb is to resolve paths relative to the
repository root.
It seems dirstate.getcwd() isn't used to get a real file path, so this patch
won't cause problem.
Yuya Nishihara <yuya@tcha.org> [Sun, 20 Sep 2015 20:08:22 +0900] rev 26293
dirstate: state that getcwd() shouldn't be used to get real file path
hgweb will force it to be '' so that file patterns can be resolved relative
to the repository root. I want to clarify that is correct.
Siddharth Agarwal <sid0@fb.com> [Wed, 16 Sep 2015 12:36:21 -0700] rev 26292
merge: move merge step to the end
Resolving other conflicts before merge ones is better because the state before
the merge is as consistent as possible. It will also help with future work
involving automatic resolution of merge conflicts with an external merge
driver.
There are no ordering issues here because it is easy to verify that the same
file is never in both the dg/dm and the m sets.
Siddharth Agarwal <sid0@fb.com> [Wed, 16 Sep 2015 19:52:06 -0700] rev 26291
lock: factor out lock testing into a separate function
This is going to be needed for upcoming work with lock inheritance.
Siddharth Agarwal <sid0@fb.com> [Wed, 16 Sep 2015 19:26:59 -0700] rev 26290
lock: factor code to read lock into a separate function
This is going to be needed for upcoming work with lock inheritance.