hg-stable: revision graph

graph

less more | rev 48611: (0) -30000 -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 tip

merge: set custom conflict label for base commit
Tue, 18 Jan 2022 15:04:55 -0800, by Martin von Zweigbergk
rebase: set custom conflict label for base commit
Tue, 18 Jan 2022 14:57:15 -0800, by Martin von Zweigbergk
simplemerge: take over formatting of label from `filemerge`
Thu, 20 Jan 2022 11:06:52 -0800, by Martin von Zweigbergk
filemerge: pass `simplemerge.MergeInput` to tool functions
Thu, 20 Jan 2022 16:16:05 -0800, by Martin von Zweigbergk
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Thu, 20 Jan 2022 14:42:50 -0800, by Martin von Zweigbergk
filemerge: always define a "base" label
Thu, 20 Jan 2022 14:13:12 -0800, by Martin von Zweigbergk
filemerge: set default labels a little earlier
Thu, 20 Jan 2022 13:43:43 -0800, by Martin von Zweigbergk
filemerge: remove unused arguments from `_merge()`
Thu, 20 Jan 2022 11:17:09 -0800, by Martin von Zweigbergk
simplemerge: take arguments as annotated context objects
Thu, 20 Jan 2022 11:00:30 -0800, by Martin von Zweigbergk
filemerge: make `labels` a required arg for `_premerge()`
Thu, 20 Jan 2022 09:04:39 -0800, by Martin von Zweigbergk
filemerge: remove unnecessary check for empty string
Thu, 20 Jan 2022 14:46:16 -0800, by Martin von Zweigbergk
tests: also test spaces in conflict marker labels
Thu, 20 Jan 2022 23:07:35 -0800, by Martin von Zweigbergk
blackbox: change year in logs to ISO 8601 format
Mon, 17 Jan 2022 21:20:46 -0500, by Valentin Gatien-Baron
blackbox: add milliseconds to blackbox logs by default
Mon, 17 Jan 2022 21:00:33 -0500, by Valentin Gatien-Baron
blackbox: correct date format doc
Mon, 17 Jan 2022 20:47:46 -0500, by Valentin Gatien-Baron
branching: merge with stable
Tue, 18 Jan 2022 10:27:13 +0100, by Raphaël Gomès
rust: Fix outdated comments in OwningDirstateMap
Mon, 17 Jan 2022 12:50:13 +0100, by Simon Sapin
merge: consider the file merged when using :merge-{local,other}
Fri, 14 Jan 2022 09:28:44 -0800, by Martin von Zweigbergk
simplemerge: delete unused exception class `CantReprocessAndShowBase`
Fri, 14 Jan 2022 08:44:36 -0800, by Martin von Zweigbergk
simplemerge: change _minimize() to minimize a single conflict
Tue, 11 Jan 2022 22:13:56 -0800, by Martin von Zweigbergk
simplemerge: make minimize() a free function
Tue, 11 Jan 2022 22:03:55 -0800, by Martin von Zweigbergk
simplemerge: simplify and rename `render_markers()`
Tue, 11 Jan 2022 21:56:27 -0800, by Martin von Zweigbergk
simplemerge: split out function for rendering :merge3 conflict markers
Tue, 11 Jan 2022 16:23:10 -0800, by Martin von Zweigbergk
simplemerge: move default labels to simplemerge extension
Fri, 07 Jan 2022 23:29:19 -0800, by Martin von Zweigbergk
simplemerge: use same newline detection for :mergediff as for :merge[3]
Fri, 07 Jan 2022 22:23:44 -0800, by Martin von Zweigbergk
simplemerge: clarify names of functions that render conflict markers
Tue, 11 Jan 2022 16:54:42 -0800, by Martin von Zweigbergk
simplemerge: make merge_lines() a free function
Fri, 07 Jan 2022 22:16:22 -0800, by Martin von Zweigbergk
simplemerge: convert `merge_lines()` away from generator
Fri, 07 Jan 2022 18:42:31 -0800, by Martin von Zweigbergk
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
Tue, 14 Dec 2021 13:12:56 -0800, by Martin von Zweigbergk
rust: upgrade `rand*` crates
Fri, 14 Jan 2022 10:25:45 -0800, by Martin von Zweigbergk
logcmdutil: raise `StateError` when file to follow doesn't exist
Thu, 06 Jan 2022 22:09:40 -0800, by Martin von Zweigbergk
logcmdutil: raise `InputError` on bad CLI arguments
Thu, 06 Jan 2022 22:03:21 -0800, by Martin von Zweigbergk
tests: support pygments 2.11 (issue6628)
Sun, 09 Jan 2022 13:35:30 +0100, by Cédric Krier
exchange: add fast path for subrepo check on push
Mon, 03 Jan 2022 01:09:56 +0100, by Joerg Sonnenberger
simplemerge: rewrite `merge_lines()` using `merge_groups()`
Wed, 05 Jan 2022 11:34:54 -0800, by Martin von Zweigbergk
simplemerge: make merge_groups() yield only 2-tuples
Thu, 06 Jan 2022 09:03:17 -0800, by Martin von Zweigbergk
rhg: desambiguate status without decompressing filelog if possible
Fri, 07 Jan 2022 14:40:21 +0100, by Simon Sapin
filelog: add a comment explaining a fast path in filerevisioncopied()
Thu, 06 Jan 2022 12:46:10 +0100, by Simon Sapin
rhg: Store p1, p2, and hash in RevlogEntry
Tue, 21 Dec 2021 21:26:14 +0100, by Simon Sapin
rhg: RevlogEntry::uncompressed_len is signed
Tue, 21 Dec 2021 21:23:46 +0100, by Simon Sapin
rhg: Expose FilelogEntry that wraps RevlogEntry
Tue, 21 Dec 2021 18:50:44 +0100, by Simon Sapin
rhg: Add RevlogEntry::data that does delta resolution
Tue, 21 Dec 2021 18:35:58 +0100, by Simon Sapin
rhg: Rename some revlog-related types and methods
Tue, 21 Dec 2021 15:57:30 +0100, by Simon Sapin
git: add opener attribute to gitstore
Wed, 05 Jan 2022 13:36:05 -0500, by Augie Fackler
branching: merge stable into default
Thu, 06 Jan 2022 09:55:28 +0100, by Raphaël Gomès
dirstate: remove deprecated API
Thu, 23 Dec 2021 14:49:28 +0100, by Raphaël Gomès
discovery: remove deprecated API
Thu, 23 Dec 2021 14:49:05 +0100, by Raphaël Gomès
revlog: remove deprecated APIs
Thu, 23 Dec 2021 14:48:31 +0100, by Raphaël Gomès
urls: remove deprecated APIs
Thu, 23 Dec 2021 14:47:52 +0100, by Raphaël Gomès
remotefilelog: remove deprecated API
Thu, 23 Dec 2021 14:47:33 +0100, by Raphaël Gomès
exchangev2: remove it
Tue, 07 Dec 2021 16:44:22 +0100, by Raphaël Gomès
rust: fix build errors on darwin
Thu, 30 Dec 2021 13:25:44 +0100, by Dan Villiom Podlaski Christiansen
merge: with stable
Tue, 04 Jan 2022 14:21:22 -0500, by Augie Fackler
help: properly document the default pattern
Fri, 15 Feb 2019 17:20:32 -0500, by Jordi Gutiérrez Hermoso
hg-core: dedup LazyAncestors Iterator impl
Fri, 10 Dec 2021 16:25:02 +0100, by pacien
hg-cpython: use ancestor iterator impls from vcsgraph
Tue, 16 Nov 2021 18:54:05 +0100, by pacien
hg-cpython: implement vcsgraph::Graph for our Index
Fri, 10 Dec 2021 15:27:22 +0100, by pacien
rust: add vcsgraph crate as dependency
Fri, 10 Dec 2021 15:22:24 +0100, by pacien
simplemerge: don't calculate conflict labels when resolving automatically
Tue, 07 Dec 2021 23:01:20 -0800, by Martin von Zweigbergk
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
Tue, 07 Dec 2021 22:45:31 -0800, by Martin von Zweigbergk
simplemerge: add a specialized function for "union", "local", "other"
Tue, 07 Dec 2021 22:33:18 -0800, by Martin von Zweigbergk
rhg: Fall back to Python if verbose status is requested by config
Sat, 18 Dec 2021 11:47:03 +0100, by Simon Sapin
rhg: Accept different "invalid ignore pattern" error message formatting
Fri, 17 Dec 2021 17:56:13 +0100, by Simon Sapin
rhg: Properly format warnings related to ignore patterns
Fri, 17 Dec 2021 16:54:22 +0100, by Simon Sapin
rhg: Sub-repositories are not supported
Tue, 09 Nov 2021 18:17:52 +0100, by Simon Sapin
simplemerge: make `localorother` a "mode" instead of a separate thing
Tue, 07 Dec 2021 17:48:50 -0800, by Martin von Zweigbergk
simplemerge: avoid a call to `pycompat.strkwargs()`
Tue, 07 Dec 2021 14:11:58 -0800, by Martin von Zweigbergk
simplemerge: stop merging file flags
Mon, 06 Dec 2021 23:17:43 -0800, by Martin von Zweigbergk
filemerge: stop returning always-`True` value
Tue, 07 Dec 2021 21:17:18 -0800, by Martin von Zweigbergk
filemerge: remove unused `orig` argument from tool functions
Mon, 06 Dec 2021 13:43:00 -0800, by Martin von Zweigbergk
filemerge: stop passing around 3 unused `None` values in `files` argument
Mon, 06 Dec 2021 12:48:01 -0800, by Martin von Zweigbergk
filemerge: rename backup variables from `back` to `backup`
Mon, 06 Dec 2021 13:15:40 -0800, by Martin von Zweigbergk
setup.py: fix some documentation typos
Sat, 18 Dec 2021 20:56:52 -0500, by Matt Harbison
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Fri, 17 Dec 2021 14:15:08 +0100, by Simon Sapin
rank: actually persist revision's rank in changelog-v2
Wed, 15 Dec 2021 15:28:41 +0100, by Pierre-Yves David
rank: add a "rank" value to the revlog-entry tuple
Tue, 14 Dec 2021 23:56:38 +0100, by Pierre-Yves David
changelog-v2: fix an assertion error to display the right data
Wed, 15 Dec 2021 14:50:07 +0100, by Pierre-Yves David
changelog-v2: use helper constant in the code to pack/unpack entries
Tue, 14 Dec 2021 19:24:24 +0100, by Pierre-Yves David
revlog: add some information about the revision we cannot find
Wed, 15 Dec 2021 15:28:30 +0100, by Pierre-Yves David
rhg: Use binary search in manifest lookup
Thu, 16 Dec 2021 17:34:51 +0100, by Simon Sapin
rust: Upgrade to format-bytes 0.3
Fri, 17 Dec 2021 11:46:30 +0100, by Simon Sapin
pytype: stop excluding ssutil.py
Tue, 14 Dec 2021 20:13:10 -0500, by Matt Harbison
pytype: stop excluding wireprotoserver.py
Tue, 14 Dec 2021 19:13:30 -0500, by Matt Harbison
pytype: stop excluding pycompat.py
Tue, 14 Dec 2021 18:36:07 -0500, by Matt Harbison
procutil: avoid an uninitialized variable usage on tempfile exception
Tue, 14 Dec 2021 17:29:30 -0500, by Matt Harbison
pytype: stop excluding procutil.py
Tue, 14 Dec 2021 17:25:46 -0500, by Matt Harbison
pytype: stop excluding chgserver.py
Tue, 14 Dec 2021 17:06:32 -0500, by Matt Harbison
pytype: stop excluding webcommands.py
Mon, 13 Dec 2021 22:46:43 -0500, by Matt Harbison
tests: drop an obsolete comment about a pytype failure
Mon, 13 Dec 2021 20:45:31 -0500, by Matt Harbison
pytype: stop excluding patch.py
Mon, 13 Dec 2021 20:19:09 -0500, by Matt Harbison
pytype: stop excluding statprof.py
Mon, 13 Dec 2021 19:34:06 -0500, by Matt Harbison
statprof: convert a few exception byte strings to str
Mon, 13 Dec 2021 17:59:36 -0500, by Matt Harbison
pytype: stop excluding wireprotov2server.py
Mon, 13 Dec 2021 16:42:36 -0500, by Matt Harbison
pytype: stop excluding stringutil.py
Mon, 13 Dec 2021 14:43:10 -0500, by Matt Harbison
pytype: stop excluding cmdutil.py
Mon, 13 Dec 2021 00:25:38 -0500, by Matt Harbison
pytype: stop excluding copies.py
Mon, 13 Dec 2021 00:04:53 -0500, by Matt Harbison

less more | rev 48611: (0) -30000 -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 tip

Mercurial > hg-stable

graph