| Tue, 05 Jan 2021 21:02:00 +0100 |
Simon Sapin |
copies-rust: split up combine_changeset_copies function into a struct
|
| Wed, 23 Dec 2020 11:48:16 +0100 |
Simon Sapin |
copies-rust: extract generic map merge logic from merge_copies_dict
|
| Mon, 21 Dec 2020 12:34:59 +0100 |
Pierre-Yves David |
copies-rust: use imrs::OrdSet instead of imrs::HashSet
|
| Mon, 21 Dec 2020 11:20:31 +0100 |
Pierre-Yves David |
copies-rust: use simpler overwrite when value on both side are identical
|
| Mon, 21 Dec 2020 11:15:45 +0100 |
Pierre-Yves David |
copies-rust: make more use of the new comparison property
|
| Wed, 16 Dec 2020 11:11:05 +0100 |
Pierre-Yves David |
copies-rust: implement PartialEqual manually
|
| Wed, 16 Dec 2020 11:06:58 +0100 |
Pierre-Yves David |
copies-rust: record "overwritten" information from both side on delete
|
| Wed, 16 Dec 2020 10:59:00 +0100 |
Pierre-Yves David |
copies-rust: refactor the "deletion" case
|
| Wed, 16 Dec 2020 10:46:08 +0100 |
Pierre-Yves David |
copies-rust: process copy information of both parent at the same time
|
| Mon, 21 Dec 2020 10:24:16 +0100 |
Pierre-Yves David |
copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()`
|
| Wed, 16 Dec 2020 10:01:34 +0100 |
Pierre-Yves David |
copies-rust: extract the processing of a single copy information
|
| Wed, 16 Dec 2020 09:42:04 +0100 |
Pierre-Yves David |
copies-rust: use matching to select the final copies information
|
| Wed, 16 Dec 2020 09:30:25 +0100 |
Pierre-Yves David |
copies-rust: get the parents' copies earlier
|
| Tue, 15 Dec 2020 18:22:57 +0100 |
Pierre-Yves David |
copies-rust: remove the ancestor Oracle logic
|
| Tue, 15 Dec 2020 18:04:23 +0100 |
Pierre-Yves David |
copies-rust: track "overwrites" directly within CopySource
|
| Wed, 23 Dec 2020 03:04:43 +0100 |
Pierre-Yves David |
copies-rust: add methods to build and update CopySource
|
| Wed, 23 Dec 2020 03:04:33 +0100 |
Pierre-Yves David |
copies-rust: fix reverted argument when merging tiny minor or major
|
| Mon, 21 Dec 2020 08:42:30 +0100 |
Pierre-Yves David |
copies-rust: rename TimeStampedPathCopy to CopySource
|
| Tue, 15 Dec 2020 17:26:00 +0100 |
Pierre-Yves David |
copies-rust: rename TimeStampedPathCopies to InternalPathCopies
|
| Sat, 12 Dec 2020 19:35:08 +0100 |
Pierre-Yves David |
copies: detect case when a merge decision overwrite previous data
|
| Mon, 14 Dec 2020 19:26:33 +0100 |
Pierre-Yves David |
copies: rearrange all value comparison conditional
|
| Mon, 22 Feb 2021 12:21:00 +0100 |
Pierre-Yves David |
test-copies: introduce merge chains test for the P/Q merges
|
| Mon, 22 Feb 2021 11:56:58 +0100 |
Pierre-Yves David |
test-copies: add a case involving the `b` and a new `r` branch
|
| Fri, 19 Feb 2021 20:46:33 +0100 |
Pierre-Yves David |
test-copies: introduce case combining the `p` and `q` branch
|
| Fri, 19 Feb 2021 20:47:15 +0100 |
Pierre-Yves David |
test-copies: add a `q` branch similar to the `e` but on the new files
|
| Fri, 19 Feb 2021 20:47:07 +0100 |
Pierre-Yves David |
test-copies: add a `p` branch similar to the `a` but on the new files
|
| Fri, 19 Feb 2021 18:57:09 +0100 |
Pierre-Yves David |
test-copies: move the new files in the `i` branch
|
| Fri, 19 Feb 2021 17:06:12 +0100 |
Pierre-Yves David |
test-copies: add 3 new files with their own content
|
| Fri, 19 Feb 2021 16:37:55 +0100 |
Pierre-Yves David |
test-copies: introduce merge chaing test for the A/E + change tests
|
| Mon, 22 Feb 2021 19:39:33 +0100 |
Pierre-Yves David |
test-copies: add a "change during merge" variant to the A+E test
|
| Fri, 19 Feb 2021 22:56:46 +0100 |
Pierre-Yves David |
test-copies: filter out the linkrev part of `debugindex`
|
| Fri, 19 Feb 2021 22:27:25 +0100 |
Pierre-Yves David |
test-copies: use "case-id" instead of revision number when listing sidedata
|
| Wed, 17 Feb 2021 21:08:45 +0100 |
Pierre-Yves David |
test-copies: remove revision number from log
|
| Mon, 14 Dec 2020 17:56:56 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merge
|
| Mon, 14 Dec 2020 17:56:30 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merges
|
| Tue, 16 Feb 2021 15:43:54 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merges
|
| Thu, 18 Feb 2021 13:49:55 +0100 |
Pierre-Yves David |
test-copies: add subcase titles for various "conflicting" information variant
|
| Thu, 18 Feb 2021 12:45:16 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+F case
|
| Tue, 16 Feb 2021 06:02:09 +0100 |
Pierre-Yves David |
test-copies: improve description of the C+H case
|
| Tue, 16 Feb 2021 05:58:22 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+C "revert/restore" case
|
| Tue, 16 Feb 2021 05:54:55 +0100 |
Pierre-Yves David |
test-copies: improve description of the G+C case
|
| Tue, 16 Feb 2021 05:46:32 +0100 |
Pierre-Yves David |
test-copies: improve description of the G+F case
|
| Tue, 16 Feb 2021 05:39:22 +0100 |
Pierre-Yves David |
test-copies: improve description of the D+G case
|
| Tue, 16 Feb 2021 05:35:18 +0100 |
Pierre-Yves David |
test-copies: improve description of the A+E case
|
| Tue, 16 Feb 2021 05:32:20 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+D case
|
| Tue, 16 Feb 2021 05:29:04 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+C case
|
| Tue, 16 Feb 2021 05:26:46 +0100 |
Pierre-Yves David |
test-copies: improve description of the A+B case
|
| Tue, 16 Feb 2021 05:19:23 +0100 |
Pierre-Yves David |
test-copies: use intermediate variable some commit descriptions
|
| Mon, 22 Feb 2021 18:48:45 +0100 |
Pierre-Yves David |
test-copies: don't use empty file for "same content" cases
|
| Thu, 10 Dec 2020 14:25:36 +0100 |
Pierre-Yves David |
test-copies: reinstall initial identical (empty) files for chained copied
|
| Wed, 10 Feb 2021 17:08:34 +0530 |
Pulkit Goyal |
upgrade: speed up when we have only nodemap to downgrade
|
| Mon, 15 Feb 2021 15:13:20 +0530 |
Pulkit Goyal |
upgrade: write nodemap for manifests too
|
| Tue, 23 Feb 2021 12:29:41 -0800 |
Martin von Zweigbergk |
windows: fix parsing of version number to match format from D9955
|
| Tue, 23 Feb 2021 12:26:52 -0800 |
Martin von Zweigbergk |
build: make version from .hg_archival.txt consistent with that from .hg/
|
| Thu, 11 Feb 2021 11:22:53 -0800 |
Kyle Lippincott |
packaging: add Provides: python3-mercurial and Homepage to debian package
|
| Fri, 12 Feb 2021 09:53:48 +0100 |
Raphaël Gomès |
bundle2: pass the operation source down to the changegroup
|
| Fri, 12 Feb 2021 13:27:03 -0800 |
Kyle Lippincott |
gendoc: use an empty comment so aliases are separated from previous elements
|
| Fri, 12 Feb 2021 11:06:56 -0800 |
Kyle Lippincott |
gendoc: add support for loading extensions from config settings
|
| Fri, 12 Feb 2021 11:04:03 -0800 |
Kyle Lippincott |
gendoc: support defaults on customopts a bit better
|
| Wed, 10 Feb 2021 09:49:50 -0800 |
Martin von Zweigbergk |
softstrip: fix a reference to an undefined variable
|
| Wed, 10 Feb 2021 09:45:48 -0800 |
Martin von Zweigbergk |
softstrip: move _bookmarkmovements() call to where it's needed
|
| Fri, 12 Feb 2021 12:51:28 +0100 |
Raphaël Gomès |
tests: fix differing output between py2 and py3
|
| Thu, 04 Feb 2021 23:11:42 +0100 |
Joerg Sonnenberger |
build: fake PEP440 versions
|
| Thu, 04 Feb 2021 11:32:08 -0800 |
Kyle Lippincott |
tests: add a comment in a test that will hopefully save someone some time
|
| Wed, 27 Jan 2021 03:07:14 +0100 |
Joerg Sonnenberger |
changegroup: don't convert revisions to node for duplicate handling
|
| Wed, 27 Jan 2021 02:34:51 +0100 |
Joerg Sonnenberger |
revlog: change addgroup callbacks to take revision numbers
|
| Wed, 27 Jan 2021 01:43:17 +0100 |
Joerg Sonnenberger |
revlog: change addrevision to return the new revision, not node
|
| Wed, 27 Jan 2021 00:55:20 +0100 |
Joerg Sonnenberger |
revlog: change addrawrevision to return the revision
|
| Tue, 26 Jan 2021 23:56:11 +0100 |
Joerg Sonnenberger |
revlog: change _addrevision to return the new revision
|
| Mon, 08 Feb 2021 23:41:58 +0100 |
Simon Sapin |
rhg: add limited support for the `config` sub-command
|
| Mon, 08 Feb 2021 23:08:44 +0100 |
Simon Sapin |
rhg: Add support for --config CLI arguments
|
| Mon, 08 Feb 2021 21:37:30 +0100 |
Simon Sapin |
rhg: Add support for -R and --repository command-line arguments
|
| Mon, 08 Feb 2021 21:28:52 +0100 |
Simon Sapin |
rhg: Replace subcommand boilerplate with a macro
|
| Mon, 08 Feb 2021 21:05:36 +0100 |
Simon Sapin |
rhg: Move subcommand CLI arguments definitions to respective modules
|
| Mon, 08 Feb 2021 20:33:04 +0100 |
Simon Sapin |
rhg: replace command structs with functions
|
| Mon, 08 Feb 2021 11:13:56 +0100 |
Simon Sapin |
rust: Use the DisplayBytes trait in config printing
|
| Thu, 04 Feb 2021 13:32:11 -0800 |
Martin von Zweigbergk |
log: respect diff.merge in -p output
|
| Thu, 04 Feb 2021 13:21:01 -0800 |
Martin von Zweigbergk |
diff: extract function for getting possibly re-merged parent to diff against
|
| Thu, 04 Feb 2021 13:05:51 -0800 |
Martin von Zweigbergk |
diff: replace --merge option by config option
|
| Thu, 24 Dec 2020 11:21:23 -0500 |
Matt Harbison |
tagcache: distinguish between invalid and missing entries
|
| Thu, 11 Feb 2021 20:36:46 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
| Thu, 04 Feb 2021 15:04:53 +0100 |
Simon Sapin |
rhg: Parse per-repository configuration
|
| Thu, 04 Feb 2021 14:29:47 +0100 |
Simon Sapin |
rhg: Abort based on config on share-safe mismatch
|
| Thu, 04 Feb 2021 13:17:55 +0100 |
Simon Sapin |
rhg: Parse system and user configuration at program start
|
| Thu, 04 Feb 2021 13:16:21 +0100 |
Simon Sapin |
rust: Parse system and user configuration
|
| Mon, 01 Feb 2021 13:32:00 +0100 |
Simon Sapin |
rust: Remove unnecessary check for absolute path before joining
|
| Mon, 01 Feb 2021 12:25:53 +0100 |
Simon Sapin |
rust: replace read_whole_file with std::fs::read
|
| Tue, 09 Feb 2021 09:37:39 -0800 |
Martin von Zweigbergk |
wireprotopeer: clarify some variable names now that we allow snake_case
|
| Tue, 02 Feb 2021 07:02:25 +0100 |
Pierre-Yves David |
copy-tracing: add a --compute flag to debugchangedfiles
|
| Wed, 03 Feb 2021 23:23:56 -0800 |
Martin von Zweigbergk |
bundle2: print "error:abort" message to stderr instead of stdout
|
| Wed, 03 Feb 2021 13:55:58 -0800 |
Martin von Zweigbergk |
narrow: add --no-backup option for narrowing
|
| Fri, 29 Jan 2021 15:23:07 +0100 |
Pierre-Yves David |
debugdiscovery: add flags to run discovery on subsets of the local repo
|
| Tue, 02 Feb 2021 13:25:28 -0500 |
Augie Fackler |
branching: merge with stable
|
| Mon, 01 Feb 2021 00:02:00 +0530 |
Pulkit Goyal |
upgrade: implement partial upgrade for upgrading persistent-nodemap
|
| Mon, 01 Feb 2021 00:10:27 +0530 |
Pulkit Goyal |
tests: unquiet a test to show changes in next patch
|
| Sun, 31 Jan 2021 23:40:57 +0530 |
Pulkit Goyal |
nodemap: fix a typo in error message
|
| Sun, 31 Jan 2021 23:38:31 +0530 |
Pulkit Goyal |
revlog: refactor logic to compute nodemap file in separate function
|
| Sun, 31 Jan 2021 23:34:59 +0530 |
Pulkit Goyal |
nodemap: make `_persist_nodemap` a public function
|
| Sun, 31 Jan 2021 23:13:08 +0530 |
Pulkit Goyal |
engine: 'if not, else' -> 'if, else'
|
| Mon, 25 Jan 2021 14:23:47 +0530 |
Pulkit Goyal |
debugcommands: s/stdin/stdout in debugnodemap help
|
| Fri, 29 Jan 2021 15:51:00 -0800 |
Martin von Zweigbergk |
errors: use InputError in uncommit extension
|
| Mon, 01 Feb 2021 11:41:10 +0100 |
Simon Sapin |
rhg: add support for share-safe
|
| Thu, 14 Jan 2021 13:04:12 +0100 |
Simon Sapin |
rhg: initial support for shared repositories
|
| Mon, 01 Feb 2021 19:30:28 +0100 |
Simon Sapin |
rhg: Add basic test with a shared repository
|
| Tue, 02 Feb 2021 10:56:53 -0500 |
Matt Harbison |
tests: print the server error log in `test-url-download.t`
|
| Tue, 02 Feb 2021 15:35:58 +0100 |
Pierre-Yves David |
ci-fix: backed out changeset 45afff0f530a
|
| Tue, 02 Feb 2021 15:35:38 +0100 |
Pierre-Yves David |
ci-fix: backed out changeset d4c8b4b90ecb
|
| Mon, 01 Feb 2021 17:13:24 -0500 |
Augie Fackler |
relnotes: add entry for `hg diff --merge -c`
|
| Mon, 01 Feb 2021 12:55:53 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
| Mon, 01 Feb 2021 11:57:18 -0500 |
Augie Fackler |
diff: suppress `merging foo` output lines when performing a merge diff
|
| Thu, 07 May 2020 16:50:26 -0400 |
Augie Fackler |
diff: add experimental support for "merge diffs"
|
| Mon, 01 Feb 2021 12:55:31 +0100 |
Simon Sapin |
rust: use HgError in ConfigError
|
| Thu, 28 Jan 2021 20:31:42 +0100 |
Simon Sapin |
rust: Fold find_root and check_requirements into Repo::find
|
| Thu, 28 Jan 2021 19:13:55 +0100 |
Simon Sapin |
rhg: Simplify CommandError based on its use
|
| Thu, 28 Jan 2021 19:21:57 +0100 |
Simon Sapin |
rust: replace ToString impls with Display
|
| Wed, 27 Jan 2021 14:45:25 +0100 |
Simon Sapin |
rust: use HgError in RevlogError and Vfs
|
| Wed, 27 Jan 2021 14:59:09 +0100 |
Simon Sapin |
rust: replace RequirementsError with HgError
|
| Wed, 27 Jan 2021 15:04:51 +0100 |
Simon Sapin |
rhg: Print an error message in more cases
|
| Wed, 27 Jan 2021 14:00:21 +0100 |
Simon Sapin |
rust: Remove DirstateParseError and ListDirstateTrackedFilesError
|
| Wed, 27 Jan 2021 13:41:28 +0100 |
Simon Sapin |
rust: Replace DirstatePackError with HgError
|
