| Wed, 30 Sep 2020 15:46:54 +0530 |
Pulkit Goyal |
merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
|
| Wed, 30 Sep 2020 15:09:25 +0530 |
Pulkit Goyal |
tests: add newfilenode test case in test-merge-changedelete.t
|
| Thu, 01 Oct 2020 09:49:33 +0200 |
Raphaël Gomès |
rust: leverage improved match ergonomics
|
| Mon, 28 Sep 2020 15:08:02 +0200 |
Raphaël Gomès |
rust: update minimum supported Rust compiler version
|
| Fri, 25 Sep 2020 11:29:19 +0200 |
Pierre-Yves David |
changing-files: add a utility to compute the merged files post-commit
|
| Fri, 25 Sep 2020 02:01:32 +0200 |
Pierre-Yves David |
changing-files: record merged files at commit time
|
| Thu, 24 Sep 2020 09:50:09 +0200 |
Pierre-Yves David |
changing-files: add the ability to track merged files too
|
| Wed, 30 Sep 2020 18:10:29 +0200 |
Raphaël Gomès |
rust: start plugging the dirstate tree behind a feature gate
|
| Wed, 30 Sep 2020 18:10:53 +0200 |
Raphaël Gomès |
rust: introduce `dirstate-tree` cargo feature
|
| Wed, 30 Sep 2020 18:23:43 +0200 |
Raphaël Gomès |
rust: fix formatting
|
| Wed, 23 Sep 2020 10:02:16 +0200 |
Raphaël Gomès |
rust-matchers: make `Matcher` trait object-safe
|
| Mon, 28 Sep 2020 14:07:00 +0200 |
Raphaël Gomès |
rust: clippy pass
|
| Mon, 28 Sep 2020 08:07:09 -0700 |
Martin von Zweigbergk |
updaterepo: add deprecation warning
|
| Mon, 28 Sep 2020 16:54:35 +0200 |
Antoine cezar |
rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)
|
| Mon, 28 Sep 2020 16:52:35 +0200 |
Antoine cezar |
hg-core: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)
|
| Mon, 28 Sep 2020 15:21:56 +0200 |
Antoine cezar |
hg-core: return Err if `offset != bytes.len()`
|
| Mon, 28 Sep 2020 15:13:51 +0200 |
Antoine cezar |
hg-core: make `Index` owner of its bytes (D8958#inline-14994 followup 1/2)
|
| Mon, 28 Sep 2020 14:33:52 +0200 |
Antoine cezar |
hg-core: renaming of `Chunk` offset methods (D8958#inline-15002 followup)
|
| Mon, 28 Sep 2020 14:31:58 +0200 |
Antoine cezar |
hg-core: minor rewording in docstring (D8958#inline-15005 followup)
|
| Mon, 28 Sep 2020 14:29:05 +0200 |
Antoine cezar |
hg-core: use anonymous lifetime for `impl Chunk` (D8958#inline-15003 followup)
|
| Mon, 28 Sep 2020 14:27:04 +0200 |
Antoine cezar |
hg-core: use `u32` instead of `i32` in `Chunk` (D8958#inline-15001 followup)
|
| Mon, 28 Sep 2020 14:16:31 +0200 |
Antoine cezar |
hg-core: use the term `chunk` instead of `frag` (D8958#inline-15000 followup)
|
| Mon, 28 Sep 2020 14:06:23 +0200 |
Antoine cezar |
hg-core: return `Err` on decompression error (D8958#inline-15004 followup)
|
| Mon, 28 Sep 2020 14:01:57 +0200 |
Antoine cezar |
hg-core: remove useless code (D8958#inline-14988 followup)
|
| Mon, 28 Sep 2020 13:55:47 +0200 |
Antoine cezar |
hg-core: minor docstring update (D8958#inline-14991 followup)
|
| Mon, 28 Sep 2020 13:53:11 +0200 |
Antoine cezar |
hg-core: minor code style change (D8958#inline-14986 followup)
|
| Mon, 28 Sep 2020 13:51:16 +0200 |
Antoine cezar |
hg-core: Explain offset override of first revision
|
| Mon, 28 Sep 2020 13:46:14 +0200 |
Antoine cezar |
hg-core: minor code style change (D8958#inline-14993 followup)
|
| Thu, 24 Sep 2020 09:32:07 +0200 |
Pierre-Yves David |
changing-files: move default constructor value to None
|
| Mon, 28 Sep 2020 11:16:12 +0200 |
Raphaël Gomès |
rust: format with rustfmt
|
| Mon, 24 Aug 2020 15:35:34 +0530 |
Pulkit Goyal |
merge: store cases when a file is absent post merge in commitinfo
|
| Mon, 14 Sep 2020 15:08:15 +0530 |
Pulkit Goyal |
tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
|
| Thu, 03 Sep 2020 13:58:14 +0530 |
Pulkit Goyal |
commit: force create a new filenode if it was set in mergestate by merge
|
| Thu, 03 Sep 2020 13:44:06 +0530 |
Pulkit Goyal |
merge: store commitinfo if these is a dc or cd conflict
|
| Fri, 25 Sep 2020 13:58:05 +0530 |
Pulkit Goyal |
mergestate: update _stateextras instead of reassinging
|
| Mon, 14 Sep 2020 14:11:45 +0530 |
Pulkit Goyal |
tests: add some debugmergestate calls in `test-merge-criss-cross.t`
|
| Thu, 03 Sep 2020 13:54:46 +0530 |
Pulkit Goyal |
tests: add few debugrevlogindex and a log call to see changes in next test
|
| Mon, 14 Sep 2020 14:40:12 +0530 |
Pulkit Goyal |
merge: disable `m2-vs-ma` optimization if new filenode config is true
|
| Mon, 14 Sep 2020 14:31:23 +0530 |
Pulkit Goyal |
configitems: add a new config option to control new filenode functionality
|
| Wed, 23 Sep 2020 14:20:49 -0400 |
Connor Sheehan |
git: add test showing `hg commit -i` working on a git repo
|
| Mon, 21 Sep 2020 11:53:44 -0700 |
Martin von Zweigbergk |
merge: replace calls to hg.updaterepo() by merge.update()
|
| Mon, 21 Sep 2020 09:57:29 -0700 |
Martin von Zweigbergk |
merge: add a higher-level update() for the common `hg update` use case
|
| Wed, 23 Sep 2020 15:16:35 +0200 |
Pierre-Yves David |
sidedata: simply read p2copies files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:16:16 +0200 |
Pierre-Yves David |
sidedata: simply read p1copies files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:16:01 +0200 |
Pierre-Yves David |
sidedata: simply read removed files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:15:46 +0200 |
Pierre-Yves David |
sidedata: simply read added files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:13:44 +0200 |
Pierre-Yves David |
sidedata: add a `decode_files_sidedata` function
|
| Tue, 15 Sep 2020 15:37:32 +0200 |
Pierre-Yves David |
changelog: add a `changes` property on `changelogrevision`
|
| Tue, 22 Sep 2020 10:27:35 +0200 |
Pierre-Yves David |
sidedata: rename `encode_copies_sidedata` to `encode_files_sidedata`
|
| Sat, 12 Sep 2020 21:45:37 +0900 |
Yuya Nishihara |
log: pass around --rev option by walkopts
|
| Sat, 12 Sep 2020 21:39:58 +0900 |
Yuya Nishihara |
log: parse --limit option by logcmdutil.parseopts()
|
| Sat, 12 Sep 2020 21:35:26 +0900 |
Yuya Nishihara |
log: pass around --follow/--follow-first options by walkopts
|
| Sat, 12 Sep 2020 21:06:16 +0900 |
Yuya Nishihara |
log: introduce struct that carries log traversal options
|
| Sat, 12 Sep 2020 16:19:01 +0900 |
Yuya Nishihara |
log: remove unused argument from _makerevset()
|
| Sat, 12 Sep 2020 16:11:10 +0900 |
Yuya Nishihara |
log: remove stale comment about order of user revset
|
| Fri, 25 Sep 2020 17:51:34 +0200 |
Raphaël Gomès |
rust: add `dirstate_tree` module
|
| Fri, 02 Oct 2020 19:19:01 +0530 |
Pulkit Goyal |
Added signature for changeset 07731064ac41
stable
|
| Fri, 02 Oct 2020 19:18:54 +0530 |
Pulkit Goyal |
Added tag 5.5.2 for changeset 07731064ac41
stable
|
| Tue, 29 Sep 2020 14:38:46 -0700 |
Ludovic Chabant |
hgdemandimport: exclude more sqlalchemy modules
stable 5.5.2
|
| Fri, 24 Jul 2020 16:35:02 +0200 |
Raphaël Gomès |
rust-dirstatemap: add #[timed] to dirstatemap read for comparison
|
| Mon, 21 Sep 2020 11:12:58 -0700 |
Martin von Zweigbergk |
merge: make low-level update() private (API)
|
| Mon, 21 Sep 2020 10:09:39 -0700 |
Martin von Zweigbergk |
merge: use merge.clean_update() when applicable
|
| Fri, 18 Sep 2020 15:03:06 -0700 |
Martin von Zweigbergk |
rebase: teach in-memory rebase to not restart with on-disk rebase on conflict
|
| Thu, 24 Sep 2020 16:30:17 +0200 |
Raphaël Gomès |
rust: update Cargo.lock
|
| Thu, 24 Sep 2020 16:30:00 +0200 |
Raphaël Gomès |
rust-tests: add test to check if `Cargo.lock` is up-to-date
|
| Tue, 01 Sep 2020 18:08:24 +0530 |
Pulkit Goyal |
scmutil: introduce function to check whether repo uses treemanifest or not
|
| Thu, 03 Sep 2020 11:07:47 -0400 |
Valentin Gatien-Baron |
chg: make is possible to call by default an hg binary located next to chg
|
| Wed, 23 Sep 2020 14:44:21 +0200 |
Joerg Sonnenberger |
phases: fix performance regression with Python 2
|
| Wed, 23 Sep 2020 09:04:32 -0700 |
Martin von Zweigbergk |
rebase: move check for unresolved conflicts into lower-level rebasenode()
|
| Fri, 18 Sep 2020 15:40:26 -0700 |
Martin von Zweigbergk |
rebase: add dryrun property to rebaseruntime
|
| Wed, 23 Sep 2020 09:21:26 -0700 |
Martin von Zweigbergk |
rebase: when collapsing, p1 == dest, so use the former only
|
| Fri, 18 Sep 2020 15:37:03 -0700 |
Martin von Zweigbergk |
rebase: remove redundant isinmemory argument from _origrebase()
|
| Tue, 22 Sep 2020 23:18:37 -0700 |
Martin von Zweigbergk |
largefiles: prevent in-memory merge instead of switching to on-disk
|
| Mon, 21 Sep 2020 09:56:48 -0700 |
Martin von Zweigbergk |
merge: add a back_out() function to encapsulate update()
|
| Fri, 18 Sep 2020 17:19:49 +0530 |
Pulkit Goyal |
tests: update test-share-safe to work with non-zstd versions
|
| Tue, 15 Sep 2020 16:51:11 +0200 |
Antoine Cezar |
rhg: add a limited `rhg cat -r` subcommand
|
| Fri, 11 Sep 2020 17:32:53 +0200 |
Antoine Cezar |
hg-core: add a `CatRev` operation
|
| Tue, 15 Sep 2020 16:46:57 +0200 |
Antoine Cezar |
hg-core: add `files_with_nodes` to `Manifest`
|
| Tue, 15 Sep 2020 16:45:27 +0200 |
Antoine Cezar |
hg-core: add path_encode
|
| Tue, 15 Sep 2020 10:52:28 +0200 |
Antoine Cezar |
hg-core: impl TryFrom<PathBuff> for HgPathBuf
|
| Wed, 09 Sep 2020 14:53:15 +0200 |
Antoine Cezar |
rhg: add `--revision` argument to `rhg files`
|
| Fri, 18 Sep 2020 16:52:16 +0200 |
Antoine Cezar |
hg-core: add a `ListRevTrackedFiles` operation
|
| Wed, 09 Sep 2020 12:12:11 +0200 |
Antoine Cezar |
hg-core: simplify `list_tracked_files` operation
|
| Fri, 18 Sep 2020 16:52:08 +0200 |
Antoine Cezar |
hg-core: add `Revlog.get_node_rev`
|
| Wed, 09 Sep 2020 14:50:58 +0200 |
Antoine Cezar |
hg-core: add `Manifest` a specialized `Revlog`
|
| Wed, 09 Sep 2020 16:25:23 +0200 |
Antoine Cezar |
hg-core: add `Changlog` a specialized `Revlog`
|
| Wed, 02 Sep 2020 15:23:25 +0200 |
Antoine Cezar |
hg-core: check data integrity in `Revlog`
|
| Wed, 23 Sep 2020 12:26:16 +0200 |
Antoine Cezar |
rhg: Add debug timing
|
| Mon, 17 Aug 2020 16:56:39 +0200 |
Antoine Cezar |
rhg: add a limited `rhg debugdata` subcommand
|
| Wed, 09 Sep 2020 12:07:05 +0200 |
Antoine Cezar |
rhg: add a `DebugData` `Command` to prepare the `rhg debugdata` subcommand
|
| Thu, 13 Aug 2020 16:22:15 +0200 |
Antoine Cezar |
hg-core: define a `DebugData` `Operation`
|
| Fri, 04 Sep 2020 11:55:07 +0200 |
Antoine Cezar |
hg-core: Add a limited read only `revlog` implementation
|
| Wed, 16 Sep 2020 18:09:32 +0530 |
Pulkit Goyal |
mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
|
| Wed, 09 Sep 2020 16:49:19 +0530 |
Pulkit Goyal |
mergestate: introduce a new ACTION_KEEP_NEW
|
| Wed, 23 Sep 2020 15:36:15 -0700 |
Martin von Zweigbergk |
repoview: don't crash if mergestate points to non-existent node
stable
|
| Wed, 23 Sep 2020 16:07:14 -0700 |
Martin von Zweigbergk |
tests: demonstrate crash caused by pinning of non-existent mergestate node
stable
|
| Mon, 21 Sep 2020 10:23:25 -0400 |
Augie Fackler |
git: also convert timezone to int (issue6359)
|
| Fri, 18 Sep 2020 16:26:37 -0700 |
Jun Wu |
chg: fallback to original hg if stdio fds are missing
|
| Fri, 18 Sep 2020 08:27:43 -0700 |
Martin von Zweigbergk |
locking: remove support for inheriting locks in subprocess
|
| Thu, 17 Sep 2020 22:34:36 -0700 |
Martin von Zweigbergk |
mergedriver: delete it
|
| Sun, 06 Sep 2020 10:33:12 +0200 |
Raphaël Gomès |
rust-cpython: switch logging facade from `simple_logger` to `env_logger`
|
| Tue, 22 Sep 2020 09:06:09 -0400 |
Connor Sheehan |
git: pass `id` attribute of `pygit2.Tree` object
|
| Wed, 16 Sep 2020 12:13:46 -0700 |
Kyle Lippincott |
branchmap: add a cache validation cache, avoid expensive re-hash on every use
|
| Mon, 21 Sep 2020 15:05:38 -0400 |
Augie Fackler |
merge with stable
|
| Wed, 16 Sep 2020 19:32:53 +0200 |
Antoine cezar |
run-test: allow relative path in `--blacklist` and `--whitelist` (issue6351)
|
| Fri, 18 Sep 2020 15:10:14 -0700 |
Martin von Zweigbergk |
rebase: stop clearing on-disk mergestate when running in memory
|
| Fri, 18 Sep 2020 10:15:13 -0700 |
Martin von Zweigbergk |
rebase: delete unused p1 argument to _concludenode()
|
| Fri, 18 Sep 2020 10:04:02 -0700 |
Martin von Zweigbergk |
rebase: fix an inconsistent hyphenation in a debug message
|
| Fri, 18 Sep 2020 12:20:28 +0200 |
Pierre-Yves David |
strip: with --keep, consider all revs "removed" from the wcp (issue6270)
stable
|
| Fri, 18 Sep 2020 12:10:12 +0200 |
Pierre-Yves David |
test-strip: display more information highlight buggy behavior
stable
|
| Tue, 15 Sep 2020 15:03:07 +0200 |
Pierre-Yves David |
changing-files: implement equality checking
|
| Thu, 17 Sep 2020 11:21:13 +0200 |
Pierre-Yves David |
changing-files: document the various sets
|
| Fri, 18 Sep 2020 10:48:43 -0400 |
Augie Fackler |
merge with stable
|
| Fri, 18 Sep 2020 20:19:52 +0900 |
Yuya Nishihara |
share: do not write working-copy requirements twice
|
| Sun, 13 Sep 2020 15:59:23 +0900 |
Yuya Nishihara |
py3: fix formatting of LookupError for workingctx
stable
|
| Thu, 17 Sep 2020 22:45:51 -0700 |
Martin von Zweigbergk |
phabricator: fix loadhgrc() override broken by D8656
|
| Thu, 17 Sep 2020 23:09:47 -0700 |
Martin von Zweigbergk |
mergestate: move commit() from base class to on-disk subclass
|
| Thu, 17 Sep 2020 23:12:48 -0700 |
Martin von Zweigbergk |
mergestate: make in-memory mergestate not clear on-disk mergestate on reset()
|
| Tue, 15 Sep 2020 16:10:16 -0700 |
Martin von Zweigbergk |
merge: use in-memory mergestate when using in-memory context
|
| Tue, 15 Sep 2020 11:17:24 -0700 |
Martin von Zweigbergk |
mergestate: extract a base class to be shared by future memmergestate
|
