| Fri, 21 Jan 2022 16:02:26 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
changeset |
files
|
| Fri, 21 Jan 2022 15:52:48 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
changeset |
files
|
| Fri, 21 Jan 2022 15:44:15 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
changeset |
files
|
| Sat, 22 Jan 2022 01:51:28 +0100 |
Pierre-Yves David |
test-bad-http-server: introduce sock closing when writing a pattern
|
changeset |
files
|
| Sat, 22 Jan 2022 01:13:12 +0100 |
Pierre-Yves David |
test-http-bad-server: document that the value are actually a list
|
changeset |
files
|
| Fri, 21 Jan 2022 12:44:39 +0100 |
Pierre-Yves David |
test-http-bad-server: refactor the writing logic to avoid early return
|
changeset |
files
|
| Fri, 21 Jan 2022 11:58:55 +0100 |
Pierre-Yves David |
test-http-bad-server: replace the default 65537 value in output
|
changeset |
files
|
| Fri, 21 Jan 2022 11:15:56 +0100 |
Pierre-Yves David |
test-http-bad-server: refactor the reading logic to avoid early return
|
changeset |
files
|
| Fri, 21 Jan 2022 03:05:43 +0100 |
Pierre-Yves David |
test-http-bad-server: factor code dealing with "read" in the new object
|
changeset |
files
|
| Fri, 21 Jan 2022 00:54:15 +0100 |
Pierre-Yves David |
test-http-bad-server: factor code dealing with "write" in the new object
|
changeset |
files
|
| Sun, 23 Jan 2022 21:25:01 +0100 |
Pierre-Yves David |
test-http-bad-server: unify log printing for `sendall` and `write`
|
changeset |
files
|
| Fri, 21 Jan 2022 01:07:50 +0100 |
Pierre-Yves David |
test-http-bad-server: track close condition in an object
|
changeset |
files
|
| Wed, 19 Jan 2022 19:14:17 +0100 |
Pierre-Yves David |
test-http-bad-server: use more readable name for variable
|
changeset |
files
|
| Fri, 21 Jan 2022 02:07:13 +0100 |
Pierre-Yves David |
test-http-bad-server: align output by using `;`
|
changeset |
files
|
| Wed, 19 Jan 2022 19:04:55 +0100 |
Pierre-Yves David |
test-http-bad-server: highlight each test with section
|
changeset |
files
|
| Fri, 21 Jan 2022 20:50:40 +0100 |
Pierre-Yves David |
test-http-bad-server: rename config to use `-`
|
changeset |
files
|
| Tue, 18 Jan 2022 21:29:43 +0100 |
Pierre-Yves David |
test-http-bad-server: move the extension in `testlib`
|
changeset |
files
|
| Mon, 17 Jan 2022 19:29:41 +0100 |
Pierre-Yves David |
requirements: remove the `localrepo.supportedformat` attribute
|
changeset |
files
|
| Mon, 17 Jan 2022 22:48:16 +0100 |
Pierre-Yves David |
requirements: sort _basesupported
|
changeset |
files
|
| Mon, 17 Jan 2022 19:28:10 +0100 |
Pierre-Yves David |
requirements: move the comment about manifestv2 in the module
|
changeset |
files
|
| Mon, 17 Jan 2022 19:26:36 +0100 |
Pierre-Yves David |
stream-clone: add a explicit set list requirements relevant to stream clone
|
changeset |
files
|
| Mon, 24 Jan 2022 11:49:06 +0100 |
Pierre-Yves David |
stream-clone: filter possible missing requirements using all supported one
|
changeset |
files
|
| Mon, 17 Jan 2022 19:18:20 +0100 |
Pierre-Yves David |
requirements: move "bookmark in store" requirements in the right module
|
changeset |
files
|
| Mon, 17 Jan 2022 18:51:47 +0100 |
Pierre-Yves David |
stream-clone: add a explicit test for format change during stream clone
|
changeset |
files
|
| Fri, 14 Jan 2022 18:02:25 +0100 |
Pierre-Yves David |
stream-clone: factor computation of requirement of a stream clone
|
changeset |
files
|
| Fri, 14 Jan 2022 17:57:49 +0100 |
Pierre-Yves David |
stream-clone: factor computation of new clone requirement out
|
changeset |
files
|
| Tue, 18 Jan 2022 00:07:43 +0100 |
Pierre-Yves David |
stream-clone: drop some outdated lines in test-stream-bundle-v2.t
|
changeset |
files
|
| Mon, 24 Jan 2022 08:35:14 -0800 |
Martin von Zweigbergk |
relnotes: add note about changed labels texts
|
changeset |
files
|
| Fri, 21 Jan 2022 13:48:48 -0800 |
Martin von Zweigbergk |
graft: attempt to make merge labels more helpful
|
changeset |
files
|
| Fri, 21 Jan 2022 13:49:11 -0800 |
Martin von Zweigbergk |
shelve: attempt to make merge labels more helpful
|
changeset |
files
|
| Fri, 21 Jan 2022 13:48:18 -0800 |
Martin von Zweigbergk |
histedit: attempt to make merge labels more helpful
|
changeset |
files
|
| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
changeset |
files
|
| Tue, 18 Jan 2022 15:04:55 -0800 |
Martin von Zweigbergk |
merge: set custom conflict label for base commit
|
changeset |
files
|
| Tue, 18 Jan 2022 14:57:15 -0800 |
Martin von Zweigbergk |
rebase: set custom conflict label for base commit
|
changeset |
files
|
| Thu, 20 Jan 2022 11:06:52 -0800 |
Martin von Zweigbergk |
simplemerge: take over formatting of label from `filemerge`
|
changeset |
files
|
| Thu, 20 Jan 2022 16:16:05 -0800 |
Martin von Zweigbergk |
filemerge: pass `simplemerge.MergeInput` to tool functions
|
changeset |
files
|
| Thu, 20 Jan 2022 14:42:50 -0800 |
Martin von Zweigbergk |
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
|
changeset |
files
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
changeset |
files
|
| Thu, 20 Jan 2022 13:43:43 -0800 |
Martin von Zweigbergk |
filemerge: set default labels a little earlier
|
changeset |
files
|
| Thu, 20 Jan 2022 11:17:09 -0800 |
Martin von Zweigbergk |
filemerge: remove unused arguments from `_merge()`
|
changeset |
files
|
| Thu, 20 Jan 2022 11:00:30 -0800 |
Martin von Zweigbergk |
simplemerge: take arguments as annotated context objects
|
changeset |
files
|
| Thu, 20 Jan 2022 09:04:39 -0800 |
Martin von Zweigbergk |
filemerge: make `labels` a required arg for `_premerge()`
|
changeset |
files
|
| Thu, 20 Jan 2022 14:46:16 -0800 |
Martin von Zweigbergk |
filemerge: remove unnecessary check for empty string
|
changeset |
files
|
| Thu, 20 Jan 2022 23:07:35 -0800 |
Martin von Zweigbergk |
tests: also test spaces in conflict marker labels
|
changeset |
files
|
| Mon, 17 Jan 2022 21:20:46 -0500 |
Valentin Gatien-Baron |
blackbox: change year in logs to ISO 8601 format
|
changeset |
files
|
| Mon, 17 Jan 2022 21:00:33 -0500 |
Valentin Gatien-Baron |
blackbox: add milliseconds to blackbox logs by default
|
changeset |
files
|
| Mon, 17 Jan 2022 20:47:46 -0500 |
Valentin Gatien-Baron |
blackbox: correct date format doc
|
changeset |
files
|
| Tue, 18 Jan 2022 10:27:13 +0100 |
Raphaël Gomès |
branching: merge with stable
|
changeset |
files
|
| Mon, 17 Jan 2022 12:50:13 +0100 |
Simon Sapin |
rust: Fix outdated comments in OwningDirstateMap
|
changeset |
files
|
| Fri, 14 Jan 2022 09:28:44 -0800 |
Martin von Zweigbergk |
merge: consider the file merged when using :merge-{local,other}
|
changeset |
files
|
| Fri, 14 Jan 2022 08:44:36 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused exception class `CantReprocessAndShowBase`
|
changeset |
files
|
| Tue, 11 Jan 2022 22:13:56 -0800 |
Martin von Zweigbergk |
simplemerge: change _minimize() to minimize a single conflict
|
changeset |
files
|
| Tue, 11 Jan 2022 22:03:55 -0800 |
Martin von Zweigbergk |
simplemerge: make minimize() a free function
|
changeset |
files
|
| Tue, 11 Jan 2022 21:56:27 -0800 |
Martin von Zweigbergk |
simplemerge: simplify and rename `render_markers()`
|
changeset |
files
|
| Tue, 11 Jan 2022 16:23:10 -0800 |
Martin von Zweigbergk |
simplemerge: split out function for rendering :merge3 conflict markers
|
changeset |
files
|
| Fri, 07 Jan 2022 23:29:19 -0800 |
Martin von Zweigbergk |
simplemerge: move default labels to simplemerge extension
|
changeset |
files
|
| Fri, 07 Jan 2022 22:23:44 -0800 |
Martin von Zweigbergk |
simplemerge: use same newline detection for :mergediff as for :merge[3]
|
changeset |
files
|
| Tue, 11 Jan 2022 16:54:42 -0800 |
Martin von Zweigbergk |
simplemerge: clarify names of functions that render conflict markers
|
changeset |
files
|
| Fri, 07 Jan 2022 22:16:22 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_lines() a free function
|
changeset |
files
|
| Fri, 07 Jan 2022 18:42:31 -0800 |
Martin von Zweigbergk |
simplemerge: convert `merge_lines()` away from generator
|
changeset |
files
|