Mercurial: Graph

simplemerge: simplify and rename `render_markers()`
2022-01-11, by Martin von Zweigbergk
simplemerge: split out function for rendering :merge3 conflict markers
2022-01-11, by Martin von Zweigbergk
simplemerge: move default labels to simplemerge extension
2022-01-07, by Martin von Zweigbergk
simplemerge: use same newline detection for :mergediff as for :merge[3]
2022-01-07, by Martin von Zweigbergk
simplemerge: clarify names of functions that render conflict markers
2022-01-11, by Martin von Zweigbergk
simplemerge: make merge_lines() a free function
2022-01-07, by Martin von Zweigbergk
simplemerge: convert `merge_lines()` away from generator
2022-01-07, by Martin von Zweigbergk
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
2021-12-14, by Martin von Zweigbergk
rust: upgrade `rand*` crates
2022-01-14, by Martin von Zweigbergk
logcmdutil: raise `StateError` when file to follow doesn't exist
2022-01-06, by Martin von Zweigbergk
logcmdutil: raise `InputError` on bad CLI arguments
2022-01-06, by Martin von Zweigbergk
subrepo: make -S work again on Windows for incoming/outgoing to remote repos stable
2022-01-10, by Matt Harbison
tests: support pygments 2.11 (issue6628)
2022-01-09, by Cédric Krier
exchange: add fast path for subrepo check on push
2022-01-03, by Joerg Sonnenberger
simplemerge: rewrite `merge_lines()` using `merge_groups()`
2022-01-05, by Martin von Zweigbergk
simplemerge: make merge_groups() yield only 2-tuples
2022-01-06, by Martin von Zweigbergk
rhg: desambiguate status without decompressing filelog if possible
2022-01-07, by Simon Sapin
filelog: add a comment explaining a fast path in filerevisioncopied()
2022-01-06, by Simon Sapin
rhg: Store p1, p2, and hash in RevlogEntry
2021-12-21, by Simon Sapin
rhg: RevlogEntry::uncompressed_len is signed
2021-12-21, by Simon Sapin
rhg: Expose FilelogEntry that wraps RevlogEntry
2021-12-21, by Simon Sapin
rhg: Add RevlogEntry::data that does delta resolution
2021-12-21, by Simon Sapin
rhg: Rename some revlog-related types and methods
2021-12-21, by Simon Sapin
git: add opener attribute to gitstore
2022-01-05, by Augie Fackler
branching: merge stable into default
2022-01-06, by Raphaël Gomès
Added signature for changeset 799fdf4cca80 stable
2022-01-05, by Raphaël Gomès
Added tag 6.0.1 for changeset 799fdf4cca80 stable
2022-01-05, by Raphaël Gomès
docs: update Rust readme with a mention of `rhg` stable 6.0.1
2021-11-26, by Raphaël Gomès
docs: fix typos and wording for the persistent-nodemap feature stable
2021-11-26, by Raphaël Gomès
docs: add missing dirstate-v2 documentation stable
2021-11-26, by Raphaël Gomès
docs: add documentation about Rust stable
2021-11-26, by Raphaël Gomès
dirstate: remove deprecated API
2021-12-23, by Raphaël Gomès
discovery: remove deprecated API
2021-12-23, by Raphaël Gomès
revlog: remove deprecated APIs
2021-12-23, by Raphaël Gomès
urls: remove deprecated APIs
2021-12-23, by Raphaël Gomès
remotefilelog: remove deprecated API
2021-12-23, by Raphaël Gomès
exchangev2: remove it
2021-12-07, by Raphaël Gomès
rust: fix build errors on darwin
2021-12-30, by Dan Villiom Podlaski Christiansen
merge: with stable
2022-01-04, by Augie Fackler
help: properly document the default pattern
2019-02-15, by Jordi Gutiérrez Hermoso
heptapod-ci: make Windows jobs manual again stable
2022-01-03, by Raphaël Gomès
tests: allow for variation in zstd output as seen on s390x and powerpc stable
2021-08-25, by Julien Cristau
hg-core: dedup LazyAncestors Iterator impl
2021-12-10, by pacien
hg-cpython: use ancestor iterator impls from vcsgraph
2021-11-16, by pacien
hg-cpython: implement vcsgraph::Graph for our Index
2021-12-10, by pacien
rust: add vcsgraph crate as dependency
2021-12-10, by pacien
simplemerge: don't calculate conflict labels when resolving automatically
2021-12-07, by Martin von Zweigbergk
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
2021-12-07, by Martin von Zweigbergk
simplemerge: add a specialized function for "union", "local", "other"
2021-12-07, by Martin von Zweigbergk
rhg: Fall back to Python if verbose status is requested by config
2021-12-18, by Simon Sapin
rhg: Accept different "invalid ignore pattern" error message formatting
2021-12-17, by Simon Sapin
rhg: Properly format warnings related to ignore patterns
2021-12-17, by Simon Sapin
rhg: Sub-repositories are not supported
2021-11-09, by Simon Sapin
simplemerge: make `localorother` a "mode" instead of a separate thing
2021-12-07, by Martin von Zweigbergk
simplemerge: avoid a call to `pycompat.strkwargs()`
2021-12-07, by Martin von Zweigbergk
simplemerge: stop merging file flags
2021-12-06, by Martin von Zweigbergk
filemerge: stop returning always-`True` value
2021-12-07, by Martin von Zweigbergk
filemerge: remove unused `orig` argument from tool functions
2021-12-06, by Martin von Zweigbergk
filemerge: stop passing around 3 unused `None` values in `files` argument
2021-12-06, by Martin von Zweigbergk
filemerge: rename backup variables from `back` to `backup`
2021-12-06, by Martin von Zweigbergk
setup.py: fix some documentation typos
2021-12-18, by Matt Harbison
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
2021-12-17, by Simon Sapin
rank: actually persist revision's rank in changelog-v2
2021-12-15, by Pierre-Yves David
rank: add a "rank" value to the revlog-entry tuple
2021-12-14, by Pierre-Yves David
changelog-v2: fix an assertion error to display the right data
2021-12-15, by Pierre-Yves David
changelog-v2: use helper constant in the code to pack/unpack entries
2021-12-14, by Pierre-Yves David
revlog: add some information about the revision we cannot find
2021-12-15, by Pierre-Yves David
rhg: Use binary search in manifest lookup
2021-12-16, by Simon Sapin
sparse: lock the store when updating requirements config stable
2021-11-29, by Arseniy Alekseyev
sparse: demonstrate a bug when used with safe-share stable
2021-11-16, by Arseniy Alekseyev
rust: Upgrade to format-bytes 0.3
2021-12-17, by Simon Sapin
pytype: stop excluding ssutil.py
2021-12-14, by Matt Harbison
pytype: stop excluding wireprotoserver.py
2021-12-14, by Matt Harbison
pytype: stop excluding pycompat.py
2021-12-14, by Matt Harbison
procutil: avoid an uninitialized variable usage on tempfile exception
2021-12-14, by Matt Harbison
pytype: stop excluding procutil.py
2021-12-14, by Matt Harbison
pytype: stop excluding chgserver.py
2021-12-14, by Matt Harbison
pytype: stop excluding webcommands.py
2021-12-13, by Matt Harbison
tests: drop an obsolete comment about a pytype failure
2021-12-13, by Matt Harbison
pytype: stop excluding patch.py
2021-12-13, by Matt Harbison
pytype: stop excluding statprof.py
2021-12-13, by Matt Harbison
statprof: convert a few exception byte strings to str
2021-12-13, by Matt Harbison
pytype: stop excluding wireprotov2server.py
2021-12-13, by Matt Harbison
pytype: stop excluding stringutil.py
2021-12-13, by Matt Harbison
pytype: stop excluding cmdutil.py
2021-12-13, by Matt Harbison
pytype: stop excluding copies.py
2021-12-13, by Matt Harbison
copies: fix some documentation typos
2021-12-12, by Matt Harbison
copies: drop an unused variable
2021-12-12, by Matt Harbison
pytype: stop excluding lsprof.py
2021-12-12, by Matt Harbison
pytype: stop excluding changegroup.py
2021-12-12, by Matt Harbison
pytype: stop excluding upgrade.py
2021-12-12, by Matt Harbison
rhg: Skip reading the contents of ambiguous files in some cases
2021-12-14, by Simon Sapin
rhg: Mark it as expected that the issue6528 bug is not reproduced
2021-12-14, by Simon Sapin
filemerge: remove leftover documentation of removed argument
2021-12-14, by Martin von Zweigbergk
merge with stable
2021-12-13, by Matt Harbison
rhg: Print "bad match" errors in rhg status
2021-12-13, by Simon Sapin
share: make it possible to control the working copy format variant
2021-12-07, by Pierre-Yves David
share: move the requirement initialisation code around
2021-12-07, by Pierre-Yves David
test: use `hg debugrequires` instead of `cat` in some tests
2021-12-08, by Pierre-Yves David
test: simplify `debugformat` matching in test-phases.t
2021-12-08, by Pierre-Yves David
test: simplify `debugformat` matching in test-copies-chain-merge
2021-12-07, by Pierre-Yves David
status: when extracting arguments from `opts`, use the same default values
2021-12-07, by Kyle Lippincott
directaccess: fix uses of commands.status() that don't go through flag parsing
2021-12-07, by Kyle Lippincott
test: add test for a former race resulting in bad dirstate
2021-11-07, by Valentin Gatien-Baron
rhg: fix a crash on non-generaldelta revlogs
2021-12-07, by Arseniy Alekseyev
rhg: centralize index header parsing
2021-12-07, by Arseniy Alekseyev
rhg: demonstrate that rhg breaks on non-generaldelta revlogs
2021-12-07, by Arseniy Alekseyev
tests: add a short `sleep` in test-status.t
2021-12-10, by Simon Sapin
rhg: Add support for `rhg status --copies`
2021-12-10, by Simon Sapin
rhg: refactor relativize_path into a struct + method
2021-12-10, by Simon Sapin
rhg: refactor display_status_paths with a struct for common arguments
2021-12-10, by Simon Sapin
rhg: Add support for ui.ignore and ui.ignore.* config
2021-12-10, by Simon Sapin
doc: remove a spurious ^L in some doc
2021-12-10, by Pierre-Yves David
upgrade: drop some dead code
2021-12-06, by Pierre-Yves David
upgrade: only process revlogs that needs it by default
2021-12-06, by Pierre-Yves David
upgrade: issue a message when a revlog type has to be upgraded
2021-12-06, by Pierre-Yves David
upgrade: explicitly warn when a `--no-xxx` flag is overwritten
2021-12-06, by Pierre-Yves David
upgrade: make the list of explicitly specified revlog a dict
2021-12-06, by Pierre-Yves David
upgrade: move the revlog selection code lower down the chain
2021-12-06, by Pierre-Yves David
rhg: Set second_ambiguous as needed in post-status fixup
2021-12-09, by Simon Sapin
dirstate: Document Timestamp.second_ambiguous
2021-12-09, by Simon Sapin
hghave: fix the check for suid on platforms lacking support stable
2021-12-13, by Matt Harbison
upgrade: byteify a few error messages stable
2021-12-12, by Matt Harbison
rhg: support the new extension suboptions syntax
2021-12-07, by Raphaël Gomès
branching: merge stable into default
2021-12-08, by Raphaël Gomès
dirstate-v2: fix upgrade on an empty repository stable
2021-12-06, by Pierre-Yves David
dirstate-v2: test upgrade without rust too stable
2021-12-06, by Pierre-Yves David
upgrade: don't use `dd status=none` in the test stable
2021-12-07, by Pierre-Yves David
test-upgrade: narrow the `debugformat` call when upgrading to dirstate-v2 stable
2021-12-06, by Pierre-Yves David
filemerge: remove `premerge` argument from `_makebackup()`
2021-12-06, by Martin von Zweigbergk
filemerge: inline `_filemerge()` into `filemerge()`
2021-12-03, by Martin von Zweigbergk
filemerge: make `_filemerge()` do both premerge and merge
2021-12-03, by Martin von Zweigbergk
filemerge: merge `premerge()` into `filemerge()`
2021-12-03, by Martin von Zweigbergk
mergestate: inline `_resolve()` into `resolve()`
2021-12-03, by Martin von Zweigbergk
mergestate: make `_resolve()` do both preresolve and resolve
2021-12-03, by Martin von Zweigbergk
mergestate: merge `preresolve()` into `resolve()`
2021-12-02, by Martin von Zweigbergk
tests: remove unnecessary explicit args from `failfilemerge.py`
2021-12-03, by Martin von Zweigbergk
simplemerge: set `conflicts` earlier for :union tool
2021-11-29, by Martin von Zweigbergk
downgrade: don't assume existence of nodemap files when downgrading stable
2021-11-25, by Raphaël Gomès
typo: s/unkown/unknown across the codebase
2021-11-26, by Raphaël Gomès
rhg: Update the dirstate on disk after status
2021-11-25, by Simon Sapin
rhg: Add Repo::write_dirstate
2021-12-02, by Simon Sapin
rhg: Add lazy/cached dirstate data file ID parsing on Repo
2021-12-02, by Simon Sapin
rhg: Make Repo::dirstate_parents a LazyCell
2021-11-29, by Simon Sapin
rust: Add Vfs::write_atomic
2021-11-29, by Simon Sapin
rhg: Initial repository locking
2021-03-22, by Simon Sapin
rust: Serializing a DirstateMap does not mutate it anymore
2021-11-29, by Simon Sapin
rhg: don't run `blackbox` if not activated
2021-11-26, by Raphaël Gomès
rust: add function to check if an extension is enabled
2021-11-26, by Raphaël Gomès
dirstate: remove unused method
2021-12-03, by Raphaël Gomès
fsmonitor: fix criteria for nonnormalset computation stable
2021-12-07, by Raphaël Gomès
fsmonitor: incorporate fixes for Python 3.10 (issue6612) stable
2021-12-06, by Raphaël Gomès
python2-compat: fix extensions' tests on python2
2021-12-04, by Pierre-Yves David
rhg: add support for narrow clones and sparse checkouts
2021-11-16, by Arseniy Alekseyev
update: reformat the `commands.update.check` help
2021-12-03, by Pierre-Yves David
update: properly overwrite `check` config with `--no-` variants
2021-12-03, by Pierre-Yves David
update: add a test for `--merge` overriding the "abort" config
2021-12-03, by Pierre-Yves David
update: use long version of the flag in the test
2021-12-03, by Pierre-Yves David
backout: backed out changeset 5d83a40cd3f8
2021-11-22, by Raphaël Gomès
status: keep second-ambiguous mtimes during fixup
2021-11-24, by Pierre-Yves David
dirstate-item: make sure we load `mtime-second-ambiguous` from disk
2021-11-24, by Pierre-Yves David
dirstate-item: make sure we set the mtime-second-ambiguous on v2 write
2021-11-24, by Pierre-Yves David
dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set
2021-11-24, by Pierre-Yves David
dirstate-item: implement the comparison logic for mtime-second-ambiguous
2021-11-24, by Pierre-Yves David
dirstate-item: add a "second_ambiguous` flag in the mtime tuple
2021-11-24, by Pierre-Yves David
dirstate: drop comparison primitive on the timestamp class
2021-11-23, by Pierre-Yves David
largefile: use the proper "mtime boundary" logic during fixup
2021-11-23, by Pierre-Yves David
status: move the boundary comparison logic within the timestamp module
2021-11-23, by Pierre-Yves David
tests: remove potential mtime ambiguity in a dirstate test
2021-11-23, by Pierre-Yves David
dirstate: cleanup remaining of "now" during write
2021-11-19, by Pierre-Yves David
dirstate: remove need_delay logic
2021-11-19, by Pierre-Yves David
dirstate: remove `lastnormaltime` mechanism
2021-10-25, by Pierre-Yves David
status: use filesystem time boundary to invalidate racy mtime
2021-11-18, by Pierre-Yves David
test: use a different timestamp for the updated file
2021-11-18, by Pierre-Yves David
win32text: drop associated dirstate cache information on revert
2021-11-23, by Pierre-Yves David
dirstate: stop gathering parentfiledata in update_file
2021-11-17, by Pierre-Yves David
dirstate: stop gathering parentfiledata in update_file_p1
2021-11-17, by Pierre-Yves David
dirstate: make it mandatory to provide parentfiledata in `set_clean`
2021-11-17, by Pierre-Yves David
dirstate: do no use `set_clean` in revert
2021-11-22, by Pierre-Yves David
status: adapt the "keyword" extensions to gather stats at lookup time
2021-11-18, by Pierre-Yves David
status: adapt largefile to gather stats at lookup time
2021-11-18, by Pierre-Yves David
status: gather fixup info at comparison time
2021-11-17, by Pierre-Yves David
update: filter the ambiguous mtime in update directly
2021-11-17, by Pierre-Yves David
dirstate: move "get fs now" in the timestamp utility module
2021-11-17, by Pierre-Yves David
dirstate-item: allow mtime to be None in "parentdata"
2021-11-17, by Pierre-Yves David
dirstate: add a comment about a racy piece of code during updates
2021-11-17, by Pierre-Yves David
tests: add missing `head` for when things go wrong
2021-10-25, by Raphaël Gomès
tests: ensure a status will have non ambiguous mtime in some race test
2021-11-23, by Pierre-Yves David
tests: make sure no ambiguities remains after the commit
2021-11-18, by Pierre-Yves David
dirstate: clarify a `hg update` invocation in a test
2021-11-04, by Pierre-Yves David
test: mark rhg output as flaky
2021-12-01, by Pierre-Yves David
chistedit: explain which order the commits are presented in
2021-10-18, by Martin von Zweigbergk