Pulkit Goyal <7895pulkit@gmail.com> [Mon, 04 Dec 2017 15:50:32 +0530] rev 3223
obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 03 Dec 2017 23:40:08 +0530] rev 3222
obsnote: add an entry in CHANGELOG about it
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:47 +0530] rev 3221
amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:31 +0530] rev 3220
uncommit: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:20 +0530] rev 3219
fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:08 +0530] rev 3218
metaedit: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:13:52 +0530] rev 3217
prune: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:06:06 +0530] rev 3216
split: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 12 Nov 2017 01:54:13 +0530] rev 3215
touch: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 12 Nov 2017 01:35:51 +0530] rev 3214
obslog: add initial support for showing note in obslog
This add a very basic and initial support for showing the note stored in the
obsmarker in obslog to test the upcoming changes which adds support. The UI is
not finalised and will be improved in the patches after support is added and we
have tests with the current output.
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 12 Nov 2017 01:26:30 +0530] rev 3213
cmdrewrite: add a utility function to make sure note is of valid format
Upcoming patches will add support to store a note on various evolution related
commands by storing that in obsmarker. Since the obsmarker metadata field can't
store things above 255 bytes, this patch introduces a function which will be
used to make sure note is under 255 bytes and does not contain newlines. We
don't want notes to be multilines.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 30 Nov 2017 12:14:36 -0500] rev 3212
branching: merge with stable
Boris Feld <boris.feld@octobus.net> [Wed, 29 Nov 2017 20:50:37 -0500] rev 3211
test: remove dangling --config in test-metaedit.t
Martin von Zweigbergk <martinvonz@google.com> [Thu, 30 Nov 2017 21:31:14 -0800] rev 3210
tests: fix previously accidentally matching regexes in test-touch.t
Before Mercurial commit 6d5718e39657 (run-tests: make "| foo (re)" not
match everything, 2017-11-29), regexes like "| foo", which are common
in graphlog output, would incorrectly match anything. After that
commit, they match as they should, meaning that either "" or " foo"
would match, but not a "| foo". This commit fixes the test by
replacing the "|" by "." rather than escaping with "\|" since that
would make the graph harder to read.
Boris Feld <boris.feld@octobus.net> [Thu, 30 Nov 2017 12:09:21 -0500] rev 3209
test: update test-discovery-obshashrange.t
Boris Feld <boris.feld@octobus.net> [Wed, 29 Nov 2017 20:50:37 -0500] rev 3208
test: remove dangling --config in test-metaedit.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 24 Nov 2017 23:46:56 -0500] rev 3207
serverminitopic: also avoid reading
Avoiding to write cache for filter where topic applies is a good step, but we
need to also avoid reading it. Existing branchmap cache might exists before the
turned the feature on.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 08:00:17 +0100] rev 3206
topic: introduce a minimal extensions to enable topic on the server
This small extensions simply expose topic in the branch. This should help
getting minimal support for topic from various hosting solution (eg: bitbucket
maybe ?) See extensions help for details.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 25 Nov 2017 17:47:02 -0500] rev 3205
branching: merge stable into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 24 Nov 2017 22:36:57 +0100] rev 3204
pusoperation: wrap pushoperation __init__ directly
This is how remote names does it. Using the same method should helps with
compatibility when mixing the two extensions.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 23 Nov 2017 00:29:52 +0100] rev 3203
hgignore: fix .err matching patterns
We don't want to ignore .err file outside of the 'tests/' directory.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 19 Nov 2017 04:47:10 +0100] rev 3202
changelog: fix 7.0.0 release date
We date was the same as 6.8.0 for some unkown reason. We now use the date of the
tag.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 17 Nov 2017 00:51:31 +0100] rev 3201
changelog: mention the improved verbosity handling
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 17 Nov 2017 00:49:09 +0100] rev 3200
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 17 Nov 2017 00:48:08 +0100] rev 3199
changelog: update missing release date
Martin von Zweigbergk <martinvonz@google.com> [Thu, 16 Nov 2017 11:38:33 -0800] rev 3198
summaryhook: respect -q flag
There's no test coverage, but it seems pretty obvious and I don't care
enough to write a test.
Martin von Zweigbergk <martinvonz@google.com> [Thu, 16 Nov 2017 11:32:24 -0800] rev 3197
summaryhook: remove unused function
Martin von Zweigbergk <martinvonz@google.com> [Thu, 16 Nov 2017 11:22:38 -0800] rev 3196
evolve: make prev/next respect --quiet flag (issue5742)
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:30:15 +0100] rev 3195
packaging: merge 7.0.1 into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:16:37 +0100] rev 3194
packaging: mark version as development version.
This helps reduce confusion when installing non tagged version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:15:29 +0100] rev 3193
Added tag 7.0.1 for changeset e7a2a6158077
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:14:01 +0100] rev 3192
packaging: prepare version 7.0.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:13:10 +0100] rev 3191
packaging: update tested-with version
Mercurial 4.4.1 is out.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:12:38 +0100] rev 3190
changelog: mention the --publish bugfix
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:15:20 +0100] rev 3189
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:15:19 +0100] rev 3188
test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:15:18 +0100] rev 3187
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:11:00 +0100] rev 3186
compat: fix comp ability of the new phase logic for Mercurial < 4.4
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 19:08:36 +0100] rev 3185
config: clarify that config is only enabled on the repository is it setup for
This changeset change nothing but clarify a few thing. The ui passed to
'reposetup' is the same as 'repo.ui'. However we would like to clarify things a
bit.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:04:04 +0100] rev 3184
branching: merge with an old and strange head
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 02:29:28 +0200] rev 3183
branching: default into stable
It is time for a new release
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 21:05:59 +0100] rev 3182
topic: fix new head detection when using --publish on a topic
I suspected a bug lurking around there and I found one.
Boris Feld <boris.feld@octobus.net> [Tue, 14 Nov 2017 18:35:25 +0100] rev 3181
effect-flag: fix obsfate verb hooking
Mercurial core commit b81ad5b78a81 renamed a the function we hooked on and
update its signature. Update the code to detect that, which fixes tests
errors.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 14:07:19 +0100] rev 3180
test: update test output for effect flag by default
Now that effect flag is in core and turned on by default, this affect topic test
that did not had the evolve extension turned on all the time.
CORE-TEST-OUTPUT-UPDATE: a7e49a5b3e6f
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 14:21:19 +0100] rev 3179
tests: add more testing of pulling with various setting
We checks for client/server with various combination:
* extensions enabled,
* extensions enabled but exchange disabled,
* extensions disabled,
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:05:39 +0100] rev 3178
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:05:38 +0100] rev 3177
test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:05:37 +0100] rev 3176
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:04:58 +0100] rev 3175
branching: merge stable into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 12:57:43 +0100] rev 3174
changelog: add details about the pushkey related fix
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 12:36:27 +0100] rev 3173
wireproto: gracefully fail on http when trying to use older pushkey method
Previously the HTTP server would return a 500. It now returns a 410.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 12:10:22 +0100] rev 3172
wireproto: avoid exposing pushkey abort for server without evolution
Client with evolution enabled will query the 'obsolete' pushley namespace if no
other way to request obsmarkers have been found. They will do this
unconditionally as long as no other obsolescence related capabilities have been
advertised by the server.
The call is "harmless" since the namespace will be empty if obsmarkers exchange
is disabled. However, since we forbid the use of pushkey for obsmarkers this
lead to unexpected crash report for up to date client talking to a server with
the evolve extensions but exchange disabled.
We fix the issue by serving the expected empty namespace in this case. We keep
forbidding the query if obsmarker exchange is enabled since new client should
have picked another more effective was to fetch the data first.
We also add some tests for this logic.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 19:22:32 +0100] rev 3171
obsdiscovery: enforce the config on the server too
Right now, setting 'experimental.evolution.obsdiscovery=no' disable obsolescence
markers discovery on client only. The server still advertise discovery related
capabilities.
We now also honor the config on the server side.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:48:25 +0100] rev 3170
packaging: mark default branch as development version
This help avoid confusion when installing version from the repository.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:47:11 +0100] rev 3169
branching: merge back stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:58:27 +0100] rev 3168
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:58:27 +0100] rev 3167
test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:57:56 +0100] rev 3166
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:45:28 +0100] rev 3165
packaging: mark as development version
This help avoid confusion when installing non tagged version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:43:57 +0100] rev 3164
Added tag 7.0.0 for changeset c56c028f3802
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:33:14 +0100] rev 3163
packaging: prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:32:47 +0100] rev 3162
debian: drop outdate part of the description
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:32:24 +0100] rev 3161
debian: update Mercurial version dependencies
The debian package now reflect the actual requirement of the extension in its
current version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:51:55 +0100] rev 3160
branching: merge with stable to prepare version 7.0.0