Durham Goode <durham@fb.com> [Mon, 24 Aug 2015 19:33:36 -0700] rev 26076
paths: move path validation logic to its own function
Hard coding the '.hg' path in the paths class made it difficult for the hggit
extension to pull from gitrepos.
This patch moves the logic out to it's own function so extensions can add
additional checks to what is a valid path (i.e. a git repo is valid when hggit
is enabled).
Augie Fackler <augie@google.com> [Fri, 21 Aug 2015 14:33:51 -0400] rev 26075
parsers: avoid int/unsigned conversions
Detected with
make local CFLAGS='-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter' CC=clang
Augie Fackler <augie@google.com> [Fri, 21 Aug 2015 14:29:42 -0400] rev 26074
base85: fix comparison of an int and a long
Caught using
make local CFLAGS='-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter' CC=clang
Augie Fackler <augie@google.com> [Tue, 25 Aug 2015 15:52:54 -0400] rev 26073
progress: restore testedwith to the stub
Without this, hg always claims progress is at fault for problems,
which is completely crazy.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 22 Aug 2015 22:59:51 -0700] rev 26072
hgweb: make refresh interval configurable
hgwebdir refreshes the set of known repositories periodically. This
is necessary because refreshing on every request could add significant
request latency.
More than once I've found myself wanting to tweak this interval at
Mozilla. I've also wanted the ability to always refresh (often when
writing tests for our replication setup).
This patch makes the refresh interval configurable. Negative values
indicate to always refresh. The default is left unchanged.
Erik Huelsmann <ehuels@gmail.com> [Sun, 16 Aug 2015 10:19:00 +0200] rev 26071
filemerge: add 'union' merge to internal merge tool
'union merge' is a merge strategy which adds both left and right hand side
of a conflict region. Git implements this merge strategy which is very
practical to have for merging e.g. the Changelog file.