Home - Waterfall Grid T-Grid Console Builders Recent Builds Buildslaves Changesources - JSON API - About

Console View

Legend:   Passed Failed Failed Again Running Exception Offline No data

Matt Mackall
templater: move verbosity-to-template matcher to constructor

We're going to reuse this and it's silly for it to be done per-cset anyway.
  • osx builder: make osx failed -  stdio
Matt Mackall
templater: remove pseudo-ternary
  • osx builder: make osx failed -  stdio
Matt Mackall
templater: fix variable name that shadows built-in
  • osx builder: make osx failed -  stdio
Matt Mackall
templater: minor whitespace tweaks
  • osx builder: make osx failed -  stdio
Matt Mackall
lock: make trylock private
Matt Mackall
lock: loop a finite number of times in trylock (issue4787)

..before falling back to lock, which will sleep. This only addresses
the CPU consumption of the reported issue.
Yuya Nishihara
reachableroots: silence warning of implicit integer narrowing issued by clang

Tested with CFLAGS=-Wshorten-64-to-32 CC=clang which is the default of
Mac OS X.

Because a valid revnum shouldn't exceed INT_MAX, we don't need long width for
large tovisit array.
Yuya Nishihara
reachableroots: narrow scope of minidx variable

minidx is never used if includepath is false, so let's define it where it
is used.
Durham Goode
convert: fix syncing deletes from p2 merge commit

Recently we fixed converting merges to correctly sync changes from p2. We missed
the case of deletes though (so p2 deleted a file that p1 had not yet deleted,
and the file does not belong to the source).

The fix is to detect when p2 doesn't have the file, so we just sync it as a
delete to p1 in the merge.

Updated the test, and verified it failed before the fix.
Durham Goode
convert: add convert.git.skipsubmodules option

This adds an option to not pull in gitsubmodules during a convert. This is
useful when converting large git repositories where gitsubmodules were allowed
historically, but are no longer wanted.
Durham Goode
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
parsers: avoid int/unsigned conversions

Detected with
make local CFLAGS='-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter' CC=clang
Augie Fackler
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
progress: restore testedwith to the stub

Without this, hg always claims progress is at fault for problems,
which is completely crazy.
Gregory Szorc
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
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.
Erik Huelsmann
filemerge: split internal merge into api entry point and internal helper

This is a step toward adding 'union merge' to the 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 to e.g. the Changelog file.
Erik Huelsmann
simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers

This is a step toward adding 'union merge' to the 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 to e.g. the Changelog file.

Note: the identifiers with underscores in this commit are all using existing
  variable names and/or keyword arguments.
e7e7182564f6...
Augie Fackler
parsers: avoid int/unsigned conversions

Detected with
make local CFLAGS='-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter' CC=clang
c1aefe57cf4e...
Augie Fackler
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
5ef327e9c157...
Augie Fackler
progress: restore testedwith to the stub

Without this, hg always claims progress is at fault for problems,
which is completely crazy.
06320fb11699...
Gregory Szorc
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.
ff12a6c63c3d...
Erik Huelsmann
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.
e15966216aec...
Erik Huelsmann
filemerge: split internal merge into api entry point and internal helper

This is a step toward adding 'union merge' to the 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 to e.g. the Changelog file.
09d6725cbc60...
Erik Huelsmann
simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers

This is a step toward adding 'union merge' to the 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 to e.g. the Changelog file.

Note: the identifiers with underscores in this commit are all using existing
  variable names and/or keyword arguments.