Augie Fackler
137e46c3ae
bdiff: re-wrap lines per clang-format
...
A few too-wide lines corrected, and some places where clang-format
prefers to wrap after the binary operator instead of before. I don't
feel strongly, so I'm leaving the auto-format result as "after the
binary operator".
Differential Revision: https://phab.mercurial-scm.org/D1007
2017-10-04 10:50:54 -04:00
Augie Fackler
49e9563e2f
bdiff: remove extra space after * per clang-format
...
Differential Revision: https://phab.mercurial-scm.org/D1006
2017-10-04 10:49:34 -04:00
Augie Fackler
2163c58549
bdiff: fix misplaced comma in macro definition with clang-format
...
Differential Revision: https://phab.mercurial-scm.org/D1005
2017-10-04 10:48:46 -04:00
Augie Fackler
663aee0a1f
bdiff: format header file with clang-format
...
Differential Revision: https://phab.mercurial-scm.org/D1004
2017-10-04 10:47:51 -04:00
Augie Fackler
834627e694
bdiff: sort includes using clang-format
...
Differential Revision: https://phab.mercurial-scm.org/D1003
2017-10-04 10:47:19 -04:00
muxator
178f61557c
build: "make deb" failed when the base path contained spaces
...
With these changes, all the commands triggered by "make deb" use proper quoting
and succeed even when invoked from a directory containing spaces.
2017-10-11 01:47:00 +02:00
muxator
292c1fdcc4
build: chg build was failing when the base directory contained spaces
2017-10-11 02:06:12 +02:00
muxator
62eddfee7e
build: initial version detection by make deb/rpm was missing quoting
2017-10-11 01:37:43 +02:00
muxator
0c29e9b194
build: make install in "/doc" failed if the destination dir contained spaces
...
This and the following commits try to add the necessary quoting in the build
scripts to make the process more robust.
The target for now is rendering "make deb" successful even when the base
directory contains spaces (eg. "/opt/mercu rial").
The build process should succeed without scattering files in spurious
directories (eg.: "/opt/mercu/usr/bin/hg").
2017-10-11 01:19:48 +02:00
Paul Morelle
eb2ac24b51
strip: take branch into account when selecting update target (issue5540)
...
Test contributed by Matt Harbison
Keep the same behavior in most cases (i.e. first parent of the first root of
stripped changsets), but if the branch differs from wdir's, try to find another
parent of stripped commits that is on the same branch.
2017-10-05 16:13:05 +02:00
Denis Laxalde
2964e634ed
scmutil: factor out building of transaction summary callback
...
In registersummarycallback(), we extra generic bits of the existing
"reportsummary" function into a decorator which will be used in forthcoming
changesets to add new summary callbacks.
2017-10-04 18:49:09 +02:00
Denis Laxalde
df0f57f316
scmutil: factor out transaction name lookup in registersummarycallback()
...
Add an inner txmatch function in registersummarycallback() factoring out the
logic to determine if the transaction matches a particular sources set. We'll
reuse this function to add some new report logic in the new changeset.
2017-10-01 09:52:44 +02:00
Boris Feld
9ab1fae2b8
configitems: register the annotate diff options
2017-10-11 05:23:45 +02:00
Boris Feld
1d9fc2f4c6
configitems: register the 'convert.cvsps.logencoding' config
2017-10-11 05:42:56 +02:00
Boris Feld
cfd170bf5c
configitems: register the 'ui.interface.chunkselector' config
2017-10-11 05:36:10 +02:00
Boris Feld
b09f40c232
configitems: register the 'experimental.archivemetatemplate' config
2017-10-11 05:18:20 +02:00
Boris Feld
103976d6a9
configitems: register the 'rebase.singletransaction' config
2017-10-11 04:57:54 +02:00
Boris Feld
bea8fba132
configitems: register the 'server.bundle*' family of config
...
All these config use the same function specifying a default value. We need to
register them all at the same time.
2017-10-11 17:51:40 +02:00
Boris Feld
baa18d572d
configitems: register the 'web.logourl' config
2017-10-11 04:16:17 +02:00
Boris Feld
8209e13aaa
configitems: register the 'web.logoimg' config
2017-10-11 04:16:05 +02:00
Boris Feld
783ea5f54c
configitems: register the 'web.labels' config
2017-10-11 04:15:48 +02:00
Boris Feld
da25127b96
configitems: register the 'web.hidden' config
2017-10-11 04:15:37 +02:00
Boris Feld
34bf70b86f
configitems: register the 'web.guessmime' config
2017-10-11 04:15:24 +02:00
Boris Feld
c8a7ed3681
configitems: register the 'web.deny_push' config
2017-10-11 04:15:08 +02:00
Boris Feld
4be8c3b528
configitems: register the 'web.contact' config
2017-10-11 04:14:44 +02:00
Boris Feld
c71a63f860
configitems: register the 'web.cache' config
2017-10-11 04:14:33 +02:00
Boris Feld
4d84c5f2d5
configitems: register the 'web.allowzip' config
2017-10-11 04:14:14 +02:00
Boris Feld
088bf5e857
configitems: register the 'web.allow_push' config
2017-10-11 04:14:01 +02:00
Boris Feld
e45e1468d5
configitems: register the 'web.allowpull' config
2017-10-11 04:12:50 +02:00
Boris Feld
dc941fd5a9
configitems: register the 'web.allowgz' config
2017-10-11 04:12:34 +02:00
Boris Feld
0af5173fc6
configitems: register the 'web.allowbz2' config
2017-10-11 04:12:23 +02:00
Boris Feld
ff16b03815
configitems: register the 'email.reply-to' config
2017-10-11 03:54:19 +02:00
Boris Feld
74f545a616
configitems: register the 'email.cc' config
2017-10-11 03:54:05 +02:00
Boris Feld
bffa794209
configitems: register the 'email.bcc' config
2017-10-11 03:53:58 +02:00
Boris Feld
502053e485
configitems: register the 'logtoprocess.uiblocked' config
2017-10-11 03:50:24 +02:00
Boris Feld
185e06d7c6
configitems: register the 'logtoprocess.develwarn' config
2017-10-11 03:50:14 +02:00
Boris Feld
6de7bd7a6d
configitems: register the 'logtoprocess.command' config
2017-10-11 03:49:47 +02:00
Boris Feld
c6d40db127
configitems: register the 'logtoprocess.commandfinish' config
2017-10-11 03:49:21 +02:00
Boris Feld
d9578ea92a
configitems: register the 'logtoprocess.commandexception' config
2017-10-11 03:49:04 +02:00
Boris Feld
cdcf29ac77
configitems: register the 'pager.pager' config
2017-10-11 03:45:14 +02:00
Boris Feld
64308038dd
configitems: register the 'web.maxchanges' config
2017-10-11 03:41:48 +02:00
Boris Feld
308fd61d70
configitems: register the 'web.maxfiles' config
2017-10-11 03:41:01 +02:00
Boris Feld
6ea0289f11
configitems: register the 'web.maxshortchanges' config
2017-10-11 03:39:21 +02:00
Boris Feld
5c68cc40ee
configitems: register the 'web.motd' config
2017-10-11 03:36:44 +02:00
Boris Feld
78e86af2e6
configitems: register the 'web.name' config
2017-10-11 03:32:59 +02:00
Boris Feld
176f52eb1f
configitems: register the 'web.push_ssl' config
2017-10-11 03:29:09 +02:00
Boris Feld
abce33cdad
configitems: register the 'web.view' config
2017-10-11 03:18:04 +02:00
Boris Feld
e4e49aed42
configitems: fix registration for 'blackbox.track' config
...
Default mutable values could be problematic. Use a lambda that returns the
value instead.
Thanks to martin for catching this bug.
2017-10-11 15:25:57 +02:00
Kevin Bullock
ec53973300
status: copy-edit and improve --terse and --verbose help
2017-10-10 10:27:35 -05:00
Yuya Nishihara
6cc1150344
templater: store revisions as ints so min/max won't compare them as strings
...
Because a template value has no explicit type (like ancient PHP), ifcontains()
has to coerce the type of the needle. Before, it was always converted to a
string, which meant any container type should be a list/dict of strings.
This no longer works since we've introduced min/max functions.
In order to work around the untyped nature of templater, this patch adds
a type specifier to hybrid dict/list. It isn't named as "valuetype" since
the _hybrid class can also wrap a dict.
2017-09-19 23:13:46 +09:00