muxator <a.mux@inwind.it> [Wed, 11 Oct 2017 01:37:43 +0200] rev 34623
build: initial version detection by make deb/rpm was missing quoting
muxator <a.mux@inwind.it> [Wed, 11 Oct 2017 01:19:48 +0200] rev 34622
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").
Paul Morelle <paul.morelle@octobus.net> [Thu, 05 Oct 2017 16:13:05 +0200] rev 34621
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.
Denis Laxalde <denis.laxalde@logilab.fr> [Wed, 04 Oct 2017 18:49:09 +0200] rev 34620
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.
Denis Laxalde <denis.laxalde@logilab.fr> [Sun, 01 Oct 2017 09:52:44 +0200] rev 34619
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.
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 05:23:45 +0200] rev 34618
configitems: register the annotate diff options
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 05:42:56 +0200] rev 34617
configitems: register the 'convert.cvsps.logencoding' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 05:36:10 +0200] rev 34616
configitems: register the 'ui.interface.chunkselector' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 05:18:20 +0200] rev 34615
configitems: register the 'experimental.archivemetatemplate' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:57:54 +0200] rev 34614
configitems: register the 'rebase.singletransaction' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 17:51:40 +0200] rev 34613
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.
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:16:17 +0200] rev 34612
configitems: register the 'web.logourl' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:16:05 +0200] rev 34611
configitems: register the 'web.logoimg' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:15:48 +0200] rev 34610
configitems: register the 'web.labels' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:15:37 +0200] rev 34609
configitems: register the 'web.hidden' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:15:24 +0200] rev 34608
configitems: register the 'web.guessmime' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:15:08 +0200] rev 34607
configitems: register the 'web.deny_push' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:14:44 +0200] rev 34606
configitems: register the 'web.contact' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:14:33 +0200] rev 34605
configitems: register the 'web.cache' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:14:14 +0200] rev 34604
configitems: register the 'web.allowzip' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:14:01 +0200] rev 34603
configitems: register the 'web.allow_push' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:12:50 +0200] rev 34602
configitems: register the 'web.allowpull' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:12:34 +0200] rev 34601
configitems: register the 'web.allowgz' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 04:12:23 +0200] rev 34600
configitems: register the 'web.allowbz2' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:54:19 +0200] rev 34599
configitems: register the 'email.reply-to' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:54:05 +0200] rev 34598
configitems: register the 'email.cc' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:53:58 +0200] rev 34597
configitems: register the 'email.bcc' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:50:24 +0200] rev 34596
configitems: register the 'logtoprocess.uiblocked' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:50:14 +0200] rev 34595
configitems: register the 'logtoprocess.develwarn' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:49:47 +0200] rev 34594
configitems: register the 'logtoprocess.command' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:49:21 +0200] rev 34593
configitems: register the 'logtoprocess.commandfinish' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:49:04 +0200] rev 34592
configitems: register the 'logtoprocess.commandexception' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:45:14 +0200] rev 34591
configitems: register the 'pager.pager' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:41:48 +0200] rev 34590
configitems: register the 'web.maxchanges' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:41:01 +0200] rev 34589
configitems: register the 'web.maxfiles' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:39:21 +0200] rev 34588
configitems: register the 'web.maxshortchanges' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:36:44 +0200] rev 34587
configitems: register the 'web.motd' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:32:59 +0200] rev 34586
configitems: register the 'web.name' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:29:09 +0200] rev 34585
configitems: register the 'web.push_ssl' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 03:18:04 +0200] rev 34584
configitems: register the 'web.view' config
Boris Feld <boris.feld@octobus.net> [Wed, 11 Oct 2017 15:25:57 +0200] rev 34583
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.
Kevin Bullock <kbullock+mercurial@ringworld.org> [Tue, 10 Oct 2017 10:27:35 -0500] rev 34582
status: copy-edit and improve --terse and --verbose help
Yuya Nishihara <yuya@tcha.org> [Tue, 19 Sep 2017 23:13:46 +0900] rev 34581
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.
Durham Goode <durham@fb.com> [Mon, 09 Oct 2017 12:47:22 -0700] rev 34580
fsmonitor: update to match new dirstate refactor
The dirstate was refactored so dirstate._map is now at dirstate._map._map. Same
for _copymap, is not _map.copymap. It seems none of the mercurial tests cover
this stuff, but it was caught by our Facebook extension tests.
Differential Revision: https://phab.mercurial-scm.org/D945
David Demelier <markand@malikania.fr> [Tue, 26 Sep 2017 08:37:17 +0200] rev 34579
doc: rename README to README.rst
Many hosting services consider README without extension as plain text. By using
.rst extension, we bring better formatting on many services (e.g. bitbucket).
Boris Feld <boris.feld@octobus.net> [Mon, 09 Oct 2017 08:35:55 +0200] rev 34578
test: use current user in the multi-user amend scenario
The obsfate template keyword that will be introduced in a later patch
distinguish between current user and other users when displaying the obsfate
users.
Update the test before for clarity.
Boris Feld <boris.feld@octobus.net> [Fri, 06 Oct 2017 17:05:19 +0200] rev 34577
test: cleanup verbosity variant from fatelog test
Unlike the '{obsfate}' keyword defined in 'hg-evolve', the definition of hg
fatelog in test-obsmarker-template.t is not verbosity dependent. Remove useless
call to fatelog -v and fatelog -q.
Boris Feld <boris.feld@octobus.net> [Fri, 06 Oct 2017 16:36:41 +0200] rev 34576
test: rename obsfate template alias
We will introduce an obsfate templatekw in the next patch that will conflict
with the obsfate template in the test file, rename the one in test file to
avoid this collision.
Boris Feld <boris.feld@octobus.net> [Fri, 06 Oct 2017 16:15:24 +0200] rev 34575
obsolete: add a devel.user.obsmarker
In tests, we often want to use a different username in obs-markers without
changing the default user. Add a 'devel.user.obsmarker'.
Paul Morelle <paul.morelle@octobus.net> [Thu, 05 Oct 2017 15:11:34 +0200] rev 34574
strip: factor out update target selection
The same algorithm was used in two places: one to find out which commit shall
become the parent of wdir, and the other to prepare the wdir when keeping
changes. Factoring it out prevents inconsistent changes in either occurrence.
Augie Fackler <augie@google.com> [Wed, 11 Oct 2017 03:48:11 -0700] rev 34573
contrib: add check-code rule banning use of readlink
readlink doesn't always exist, such as on Solaris-derived platforms.
Differential Revision: https://phab.mercurial-scm.org/D1000
Augie Fackler <augie@google.com> [Tue, 10 Oct 2017 11:03:14 -0400] rev 34572
tests: use readlink.py instead of readlink
The latter doesn't always exist, such as on Solaris-derived platforms.
Differential Revision: https://phab.mercurial-scm.org/D999
Augie Fackler <augie@google.com> [Tue, 10 Oct 2017 11:02:53 -0400] rev 34571
tests: use readlink.py instead of readlink
The latter doesn't always exist, such as on Solaris-derived platforms.
Differential Revision: https://phab.mercurial-scm.org/D998
Augie Fackler <augie@google.com> [Tue, 10 Oct 2017 11:02:40 -0400] rev 34570
tests: use readlink.py instead of readlink
The latter doesn't always exist, such as on Solaris-derived platforms.
Differential Revision: https://phab.mercurial-scm.org/D997
Augie Fackler <augie@google.com> [Tue, 10 Oct 2017 11:02:23 -0400] rev 34569
tests: use readlink.py instead of readlink
The latter doesn't always exist, such as on Solaris-derived platforms.
Differential Revision: https://phab.mercurial-scm.org/D996
Augie Fackler <augie@google.com> [Wed, 11 Oct 2017 01:56:49 -0700] rev 34568
ui: recommend tweakdefaults in the default hgrc template
Were I only slightly bolder, I'd make it on by default in the
suggested user hgrc.
Differential Revision: https://phab.mercurial-scm.org/D1001