| Thu, 29 Feb 2024 14:13:21 -0800 |
Martin von Zweigbergk |
crecord: drop calls to `curses.endwin()`
stable
|
| Tue, 13 Feb 2024 11:49:55 -0800 |
Martin von Zweigbergk |
docs: fix broken `make` in `docs/`
|
| Sat, 16 Dec 2023 10:48:20 -0800 |
Martin von Zweigbergk |
narrow: strip trailing `/` from manifest dir before matching it
|
| Mon, 18 Dec 2023 10:13:41 -0800 |
Martin von Zweigbergk |
tests: demonstrate error when narrowing with `rootfilesin:` pattern
|
| Mon, 18 Dec 2023 14:51:20 -0800 |
Martin von Zweigbergk |
matchers: use correct method for finding index in vector
|
| Thu, 07 Dec 2023 09:31:07 -0800 |
Martin von Zweigbergk |
statprof: handle `lineno == None` in more cases
|
| Wed, 29 Nov 2023 08:32:24 -0800 |
Martin von Zweigbergk |
add: don't attempt to add back removed files unless explicitly listed
|
| Tue, 28 Nov 2023 22:44:04 -0800 |
Martin von Zweigbergk |
tests: show failure to `hg add -I` a dir->symlink transition
|
| Mon, 13 Nov 2023 09:19:11 -0800 |
Martin von Zweigbergk |
py3: pass unicode strings to hasattr() throughout
stable
|
| Mon, 13 Nov 2023 09:19:11 -0800 |
Martin von Zweigbergk |
py3: pass unicode strings to hasattr() throughout
|
| Tue, 31 Oct 2023 22:42:46 -0700 |
Martin von Zweigbergk |
smartset: don't ignore hidden revs when intersecting
|
| Tue, 31 Oct 2023 22:33:45 -0700 |
Martin von Zweigbergk |
tests: demonstrate crash in `unstable()` with internal-phase orphans
|
| Fri, 21 Jul 2023 09:22:18 -0700 |
Martin von Zweigbergk |
contrib: upgrade merge-lists from clap v3 to clap v4
|
| Thu, 18 May 2023 17:07:43 -0700 |
Martin von Zweigbergk |
exchange: allow passing no includes/excludes to `pull()`
|
| Tue, 03 Jan 2023 13:38:56 -0800 |
Martin von Zweigbergk |
filemerge: fix crash when using filesets in [partial-merge-tools]
stable 6.3.2
|
| Tue, 29 Nov 2022 15:41:28 -0800 |
Martin von Zweigbergk |
amend: add a --draft option to set phase to draft
|
| Tue, 29 Nov 2022 13:07:16 -0800 |
Martin von Zweigbergk |
commit: add --draft option to use draft phase
|
| Tue, 29 Nov 2022 14:40:17 -0800 |
Martin von Zweigbergk |
tests: use graph log in test-phases.t
|
| Tue, 29 Nov 2022 13:31:01 -0800 |
Martin von Zweigbergk |
commit: move check for incompatible args earlier
|
| Thu, 22 Sep 2022 16:50:30 -0700 |
Martin von Zweigbergk |
status: let `--no-copies` override `ui.statuscopies`
|
| Fri, 09 Sep 2022 12:45:26 -0700 |
Martin von Zweigbergk |
fsmonitor: migrate Python ABCs from collections to collections.abc
|
| Fri, 12 Aug 2022 14:35:34 -0700 |
Martin von Zweigbergk |
status: include `repo` in template context also for resolved paths
|
| Thu, 12 May 2022 07:36:37 -0700 |
Martin von Zweigbergk |
branching: merge with stable
|
| Wed, 11 May 2022 17:56:29 -0700 |
Kyle Lippincott |
amend: stop specifying matcher, get all copies in wctx
stable
|
| Wed, 11 May 2022 17:56:10 -0700 |
Kyle Lippincott |
amend: add test showing poor behavior when copies are involved
stable
|
| Thu, 21 Apr 2022 10:39:52 -0700 |
Martin von Zweigbergk |
rust-repo: make `Send` by not storing functions in `LazyCell`
|
| Thu, 05 May 2022 14:45:28 -0400 |
Augie Fackler |
obsolete: remove two unused constants
|
| Thu, 05 May 2022 14:47:26 -0400 |
Augie Fackler |
node: manually implement Debug
|
| Tue, 26 Apr 2022 09:06:30 -0700 |
Martin von Zweigbergk |
filemerge: add configs to disable some or all partial merge tools
|
| Wed, 27 Apr 2022 15:47:57 +0200 |
Martin von Zweigbergk |
commit: don't use hard-coded `.hg/last-message.txt` path in error message
stable
|
| Tue, 19 Apr 2022 12:17:23 -0700 |
Kyle Lippincott |
amend: move "return None for removed files" into block handling filestoamend
|
| Tue, 12 Apr 2022 23:15:25 -0700 |
Martin von Zweigbergk |
changelog: avoid copying changeset data into `ChangesetRevisionData`
|
| Fri, 08 Apr 2022 21:34:18 -0700 |
Martin von Zweigbergk |
rust-nodemap: remove unnecessary explicit lifetime
|
| Tue, 12 Apr 2022 21:56:57 -0700 |
Martin von Zweigbergk |
rust-revlog: add tests for p1/p2 getters, as promised in D12442
|
| Fri, 15 Apr 2022 18:20:41 -0700 |
Martin von Zweigbergk |
rust-revlog: make `IndexEntryBuilder` build a whole entry
|
| Fri, 15 Apr 2022 17:06:10 -0700 |
Martin von Zweigbergk |
rust-revlog: change default version from 2 to 1 in test builder
|
| Fri, 15 Apr 2022 09:39:27 -0700 |
Martin von Zweigbergk |
rust-repo: extract a function for checking nodemap requirement
|
| Fri, 15 Apr 2022 09:37:13 -0700 |
Martin von Zweigbergk |
rust-revlog: make `Changelog` and `ManifestLog` unaware of `Repo`
|
| Tue, 12 Apr 2022 21:25:56 -0700 |
Martin von Zweigbergk |
rust-revlog: make unaware of `Repo`
|
| Thu, 14 Apr 2022 09:09:45 -0700 |
Martin von Zweigbergk |
rust-filelog: don't use persistent nodemap (to match Python)
|
| Tue, 12 Apr 2022 11:40:37 -0700 |
Martin von Zweigbergk |
rust-revlog: move check for nodemap requirement to caller
|
| Thu, 31 Mar 2022 22:54:33 -0700 |
Martin von Zweigbergk |
rust-nodemap-docket: make unaware of `Repo`
|
| Thu, 31 Mar 2022 22:59:19 -0700 |
Martin von Zweigbergk |
rust-nodemap-docket: move check of nodemap requirement to caller
|
| Wed, 13 Apr 2022 07:58:49 -0700 |
Martin von Zweigbergk |
absorb: make `--edit-lines` imply `--apply-changes`
|
| Mon, 18 Apr 2022 20:45:38 -0700 |
Martin von Zweigbergk |
amend: don't remove unselected removals from memctx
stable
|
| Mon, 18 Apr 2022 20:39:31 -0700 |
Martin von Zweigbergk |
tests: demonstrate crash on partial amend with copies in changesets
stable
|
| Tue, 05 Apr 2022 12:06:32 -0700 |
Martin von Zweigbergk |
rust-revlog: add methods for getting parent revs and entries
|
| Tue, 05 Apr 2022 08:47:04 -0700 |
Martin von Zweigbergk |
rust-changelog: start parsing changeset data
|
| Mon, 04 Apr 2022 23:27:16 -0700 |
Martin von Zweigbergk |
rust-changelog: remove special parsing of empty changelog data for null rev
|
| Thu, 31 Mar 2022 22:06:26 -0700 |
Martin von Zweigbergk |
rust-changelog: don't skip empty lines when iterating over changeset lines
|
| Thu, 31 Mar 2022 22:02:46 -0700 |
Martin von Zweigbergk |
rust-requirements: allow loading repos with `bookmarksinstore` requirement
|
| Wed, 13 Apr 2022 12:14:17 -0700 |
Kyle Lippincott |
rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes"
stable
|
| Wed, 13 Apr 2022 13:15:33 -0700 |
Kyle Lippincott |
tests: add test demonstrating issue with ambiguous has prefixes during rebase
stable
|
| Mon, 04 Apr 2022 18:05:33 -0700 |
Kyle Lippincott |
crecord: avoid duplicating lines when reverting noeol->eol change
|
| Tue, 05 Apr 2022 11:09:57 -0700 |
Kyle Lippincott |
crecord: add test demonstrating issue when reverting noeol->eol change
|
| Mon, 28 Mar 2022 10:43:10 -0700 |
Martin von Zweigbergk |
revert: ask user to confirm before tracking new file when interactive
|
| Mon, 28 Mar 2022 10:43:06 -0700 |
Martin von Zweigbergk |
revert: use a `continue` to reduce indentation
|
| Fri, 25 Mar 2022 08:33:03 -0700 |
Martin von Zweigbergk |
stringutil: try to avoid running `splitlines()` only to get first line
|
| Thu, 24 Mar 2022 22:05:49 -0700 |
Martin von Zweigbergk |
logcmdutil: use new function for getting first line of string
|
| Thu, 24 Mar 2022 22:05:36 -0700 |
Martin von Zweigbergk |
filemerge: use new function for getting first line of string
|
| Thu, 24 Mar 2022 22:05:27 -0700 |
Martin von Zweigbergk |
absorb: use new function for getting first line of string
|
| Thu, 24 Mar 2022 22:05:13 -0700 |
Martin von Zweigbergk |
extensions: use new function for getting first line of string
|
| Thu, 24 Mar 2022 22:04:38 -0700 |
Martin von Zweigbergk |
bookmarks: use new function for getting first line of string
|
| Thu, 24 Mar 2022 20:31:44 -0700 |
Martin von Zweigbergk |
help: use new function for getting first line of string
|
| Thu, 24 Mar 2022 16:55:09 -0700 |
Martin von Zweigbergk |
histedit: remove an unnecessary default value of `b''` for commit message
|
| Thu, 24 Mar 2022 16:51:20 -0700 |
Martin von Zweigbergk |
histedit: use new function for getting first line of a string
|
| Thu, 24 Mar 2022 16:09:12 -0700 |
Martin von Zweigbergk |
templates: extract function to `stringutil` for getting first line of text
|
| Thu, 24 Mar 2022 15:41:29 -0700 |
Martin von Zweigbergk |
templates: make `firstline` filter not keep '\v', '\f' and similar
|
| Fri, 18 Mar 2022 12:23:47 -0700 |
Martin von Zweigbergk |
merge-lists: make it possible to specify pattern to match
|
| Fri, 04 Mar 2022 16:12:56 -0800 |
Martin von Zweigbergk |
contrib: add a partial-merge tool for sorted lists (such as Python imports)
|
| Fri, 25 Mar 2022 11:33:12 -0400 |
Augie Fackler |
merge: with stable
|
| Thu, 17 Mar 2022 11:19:06 -0700 |
Martin von Zweigbergk |
partial-merge: add support for `.args` config (`$local` etc.)
|
| Tue, 18 Jan 2022 13:05:21 -0800 |
Martin von Zweigbergk |
filemerge: add support for partial conflict resolution by external tool
|
| Mon, 21 Mar 2022 14:21:10 -0700 |
Martin von Zweigbergk |
unamend: abort if commit was not created by `hg [un]amend`
stable
|
| Fri, 18 Mar 2022 21:15:54 -0700 |
Martin von Zweigbergk |
amend: fix amend with copies in extras
stable
|
| Fri, 18 Mar 2022 21:37:22 -0700 |
Martin von Zweigbergk |
tests: demonstrate that copy info in changeset gets lost on amend
stable
|
| Tue, 15 Mar 2022 13:31:39 -0700 |
Martin von Zweigbergk |
filemerge: when merge tool uses $output, don't leave markers in $local
stable
|
| Tue, 15 Mar 2022 13:40:45 -0700 |
Martin von Zweigbergk |
tests: demonstrate how conflict markers end up $local *and* $output
stable
|
| Mon, 14 Mar 2022 12:24:34 -0700 |
Kyle Lippincott |
tests: fix formatting issue in run-tests.py after c194e93d1ebc
|
| Wed, 09 Mar 2022 21:26:58 -0800 |
Kyle Lippincott |
tests: support another error case when detecting ipv4/ipv6 support
|
| Fri, 04 Mar 2022 13:01:13 -0800 |
Martin von Zweigbergk |
revlog: remove unused `rank` variable from D12209
|
| Wed, 02 Mar 2022 10:32:36 -0500 |
Augie Fackler |
rust: jettison Python 2 support
|
| Wed, 02 Mar 2022 10:30:37 -0500 |
Augie Fackler |
setup: always decode xcode version
|
| Wed, 02 Mar 2022 10:29:54 -0500 |
Augie Fackler |
setup: remove Rust support for Python 2
|
| Wed, 02 Mar 2022 10:25:11 -0500 |
Augie Fackler |
cleanup: stop bundling concurrent.futures on Python 2
|
| Wed, 02 Mar 2022 10:24:49 -0500 |
Augie Fackler |
cleanup: directly use concurrent.futures instead of via pycompat
|
| Wed, 02 Mar 2022 10:23:53 -0500 |
Augie Fackler |
imports: allow importing futures from concurrent
|
| Wed, 02 Mar 2022 10:14:24 -0500 |
Augie Fackler |
setup: remove pygit2 Python 2 logic
|
| Wed, 02 Mar 2022 10:13:45 -0500 |
Augie Fackler |
setup: inline now-constant list
|
| Wed, 02 Mar 2022 10:13:09 -0500 |
Augie Fackler |
setup: unconditionally do this python 3 step
|
| Wed, 02 Mar 2022 10:12:48 -0500 |
Augie Fackler |
setup: remove Python 2 support code for determining dylib suffix
|
| Wed, 02 Mar 2022 10:12:17 -0500 |
Augie Fackler |
setup: inline os.fsdecode now that we're done with Python 2
|
| Wed, 02 Mar 2022 10:11:37 -0500 |
Augie Fackler |
setup: inline encoding constant that is only used once
|
| Wed, 02 Mar 2022 10:07:49 -0500 |
Augie Fackler |
setup: remove printf trampoline
|
| Wed, 02 Mar 2022 10:07:21 -0500 |
Augie Fackler |
setup: remove more Python 2 support code
|
| Wed, 02 Mar 2022 10:06:37 -0500 |
Augie Fackler |
setup: remove ssl check that only matters on 2.7
|
| Wed, 02 Mar 2022 10:05:45 -0500 |
Augie Fackler |
setup: remove block that tries to help Python 2.6 users
|
| Wed, 02 Mar 2022 10:04:04 -0500 |
Augie Fackler |
setup: drop statement of support for Python before 3.5.3
|
| Mon, 14 Feb 2022 22:49:03 -0800 |
Martin von Zweigbergk |
filemerge: make `_maketempfiles()` more reusable
|
| Mon, 14 Feb 2022 22:16:29 -0800 |
Martin von Zweigbergk |
filemerge: reduce some duplication in `_maketempfiles()`
|
| Mon, 14 Feb 2022 22:11:50 -0800 |
Martin von Zweigbergk |
filemerge: use leverage `util.readfile()` in `_maketempfiles()`
|
| Mon, 14 Feb 2022 22:04:50 -0800 |
Martin von Zweigbergk |
filemerge: move removal of `.orig` extension on temp file close to context
|
| Mon, 14 Feb 2022 21:52:18 -0800 |
Martin von Zweigbergk |
filemerge: remove `uselocalpath` argument from `_maketempfiles()`
|
| Fri, 11 Feb 2022 22:39:53 -0800 |
Martin von Zweigbergk |
filemerge: remove an unnecessary join with absolute path
|
| Fri, 11 Feb 2022 21:39:55 -0800 |
Martin von Zweigbergk |
filemerge: when using in-memory merge, always put backup files in temp dir
|
| Tue, 15 Feb 2022 20:18:57 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `repo` argument from `_maketempfiles()`
|
| Tue, 15 Feb 2022 13:32:30 -0500 |
Augie Fackler |
sparse: add timing block for parsing sparse configs
|
| Tue, 15 Feb 2022 13:32:11 -0500 |
Augie Fackler |
narrowspec: add timing block for validating narrowspec
|
| Tue, 15 Feb 2022 20:24:46 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
| Fri, 11 Feb 2022 16:52:48 -0800 |
Martin von Zweigbergk |
filemerge: put temporary files in single temp dir by default
|
| Mon, 07 Feb 2022 22:54:38 -0800 |
Martin von Zweigbergk |
filemerge: move check for identical sides out of filemerge()
|
| Mon, 07 Feb 2022 20:12:09 -0800 |
Martin von Zweigbergk |
mergestate: use an early return for trivial merges
|
| Mon, 07 Feb 2022 14:07:04 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused arguments
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
| Tue, 18 Jan 2022 12:57:55 -0800 |
Martin von Zweigbergk |
filemerge: when not keeping premerge, don't write markers to context
|
| Fri, 14 Jan 2022 08:17:13 -0800 |
Martin von Zweigbergk |
simplemerge: move printing of merge result to extension
|
| Thu, 10 Feb 2022 15:48:01 -0800 |
Martin von Zweigbergk |
simplemerge: remove code for checking binary input now that callers do it
|
| Thu, 10 Feb 2022 15:27:58 -0800 |
Martin von Zweigbergk |
simplemerge: let filemerge check for binary inputs
|
| Thu, 10 Feb 2022 13:36:09 -0800 |
Martin von Zweigbergk |
simplemerge: let extension check for binary inputs (unless `--text`)
|
| Thu, 10 Feb 2022 11:00:32 -0800 |
Martin von Zweigbergk |
simplemerge: store input data in MergeInput
|
| Fri, 04 Feb 2022 18:36:36 -0800 |
Martin von Zweigbergk |
simplemerge: convert MergeInput to regular, non-attr.ib class
|
| Thu, 10 Feb 2022 09:59:07 -0800 |
Martin von Zweigbergk |
simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
|
| Thu, 10 Feb 2022 13:24:38 -0500 |
Augie Fackler |
merge: with stable
|
| Wed, 26 Jan 2022 15:32:18 -0800 |
Martin von Zweigbergk |
arbitraryfilectx: use our existing helpers for reading and writing files
|
| Thu, 11 Feb 2021 22:52:43 -0800 |
Martin von Zweigbergk |
fix: remove unnecessary and overly strict check for divergence
|
| Wed, 26 Jan 2022 10:11:01 -0800 |
Martin von Zweigbergk |
encoding: fix trim() to be O(n) instead of O(n^2)
|
| Mon, 24 Jan 2022 08:35:14 -0800 |
Martin von Zweigbergk |
relnotes: add note about changed labels texts
|
| Fri, 21 Jan 2022 13:48:48 -0800 |
Martin von Zweigbergk |
graft: attempt to make merge labels more helpful
|
| Fri, 21 Jan 2022 13:49:11 -0800 |
Martin von Zweigbergk |
shelve: attempt to make merge labels more helpful
|
| Fri, 21 Jan 2022 13:48:18 -0800 |
Martin von Zweigbergk |
histedit: attempt to make merge labels more helpful
|
| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
| Tue, 18 Jan 2022 15:04:55 -0800 |
Martin von Zweigbergk |
merge: set custom conflict label for base commit
|
| Tue, 18 Jan 2022 14:57:15 -0800 |
Martin von Zweigbergk |
rebase: set custom conflict label for base commit
|
| Thu, 20 Jan 2022 11:06:52 -0800 |
Martin von Zweigbergk |
simplemerge: take over formatting of label from `filemerge`
|
| Thu, 20 Jan 2022 16:16:05 -0800 |
Martin von Zweigbergk |
filemerge: pass `simplemerge.MergeInput` to tool functions
|
| Thu, 20 Jan 2022 14:42:50 -0800 |
Martin von Zweigbergk |
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
| Thu, 20 Jan 2022 13:43:43 -0800 |
Martin von Zweigbergk |
filemerge: set default labels a little earlier
|
| Mon, 24 Jan 2022 21:17:04 -0800 |
Martin von Zweigbergk |
unamend: error out when running on merge commit
stable
|
| Mon, 24 Jan 2022 21:12:19 -0800 |
Martin von Zweigbergk |
tests: demonstrate how `hg unamend` fails on merge commits
stable
|
| Thu, 20 Jan 2022 11:17:09 -0800 |
Martin von Zweigbergk |
filemerge: remove unused arguments from `_merge()`
|
| Thu, 20 Jan 2022 11:00:30 -0800 |
Martin von Zweigbergk |
simplemerge: take arguments as annotated context objects
|
| Thu, 20 Jan 2022 09:04:39 -0800 |
Martin von Zweigbergk |
filemerge: make `labels` a required arg for `_premerge()`
|
| Thu, 20 Jan 2022 14:46:16 -0800 |
Martin von Zweigbergk |
filemerge: remove unnecessary check for empty string
|
| Thu, 20 Jan 2022 23:07:35 -0800 |
Martin von Zweigbergk |
tests: also test spaces in conflict marker labels
|
| Fri, 14 Jan 2022 09:28:44 -0800 |
Martin von Zweigbergk |
merge: consider the file merged when using :merge-{local,other}
|
| Fri, 14 Jan 2022 08:44:36 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused exception class `CantReprocessAndShowBase`
|
| Tue, 11 Jan 2022 22:13:56 -0800 |
Martin von Zweigbergk |
simplemerge: change _minimize() to minimize a single conflict
|
| Tue, 11 Jan 2022 22:03:55 -0800 |
Martin von Zweigbergk |
simplemerge: make minimize() a free function
|
| Tue, 11 Jan 2022 21:56:27 -0800 |
Martin von Zweigbergk |
simplemerge: simplify and rename `render_markers()`
|
| Tue, 11 Jan 2022 16:23:10 -0800 |
Martin von Zweigbergk |
simplemerge: split out function for rendering :merge3 conflict markers
|
| Fri, 07 Jan 2022 23:29:19 -0800 |
Martin von Zweigbergk |
simplemerge: move default labels to simplemerge extension
|
| Fri, 07 Jan 2022 22:23:44 -0800 |
Martin von Zweigbergk |
simplemerge: use same newline detection for :mergediff as for :merge[3]
|
| Tue, 11 Jan 2022 16:54:42 -0800 |
Martin von Zweigbergk |
simplemerge: clarify names of functions that render conflict markers
|
| Fri, 07 Jan 2022 22:16:22 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_lines() a free function
|
| Fri, 07 Jan 2022 18:42:31 -0800 |
Martin von Zweigbergk |
simplemerge: convert `merge_lines()` away from generator
|
| Tue, 14 Dec 2021 13:12:56 -0800 |
Martin von Zweigbergk |
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
|
| Fri, 14 Jan 2022 10:25:45 -0800 |
Martin von Zweigbergk |
rust: upgrade `rand*` crates
|
| Thu, 06 Jan 2022 22:09:40 -0800 |
Martin von Zweigbergk |
logcmdutil: raise `StateError` when file to follow doesn't exist
|
| Thu, 06 Jan 2022 22:03:21 -0800 |
Martin von Zweigbergk |
logcmdutil: raise `InputError` on bad CLI arguments
|
| Wed, 05 Jan 2022 11:34:54 -0800 |
Martin von Zweigbergk |
simplemerge: rewrite `merge_lines()` using `merge_groups()`
|
| Thu, 06 Jan 2022 09:03:17 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_groups() yield only 2-tuples
|
| Wed, 05 Jan 2022 13:36:05 -0500 |
Augie Fackler |
git: add opener attribute to gitstore
|
| Tue, 04 Jan 2022 14:21:22 -0500 |
Augie Fackler |
merge: with stable
|
| Tue, 07 Dec 2021 23:01:20 -0800 |
Martin von Zweigbergk |
simplemerge: don't calculate conflict labels when resolving automatically
|
| Tue, 07 Dec 2021 22:45:31 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
|
| Tue, 07 Dec 2021 22:33:18 -0800 |
Martin von Zweigbergk |
simplemerge: add a specialized function for "union", "local", "other"
|
| Tue, 07 Dec 2021 17:48:50 -0800 |
Martin von Zweigbergk |
simplemerge: make `localorother` a "mode" instead of a separate thing
|
| Tue, 07 Dec 2021 14:11:58 -0800 |
Martin von Zweigbergk |
simplemerge: avoid a call to `pycompat.strkwargs()`
|
| Mon, 06 Dec 2021 23:17:43 -0800 |
Martin von Zweigbergk |
simplemerge: stop merging file flags
|
| Tue, 07 Dec 2021 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
| Mon, 06 Dec 2021 13:43:00 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `orig` argument from tool functions
|
| Mon, 06 Dec 2021 12:48:01 -0800 |
Martin von Zweigbergk |
filemerge: stop passing around 3 unused `None` values in `files` argument
|
| Mon, 06 Dec 2021 13:15:40 -0800 |
Martin von Zweigbergk |
filemerge: rename backup variables from `back` to `backup`
|
| Tue, 14 Dec 2021 13:41:34 -0800 |
Martin von Zweigbergk |
filemerge: remove leftover documentation of removed argument
|
| Tue, 07 Dec 2021 15:53:55 -0800 |
Kyle Lippincott |
status: when extracting arguments from `opts`, use the same default values
|
| Tue, 07 Dec 2021 15:48:22 -0800 |
Kyle Lippincott |
directaccess: fix uses of commands.status() that don't go through flag parsing
|
| Mon, 06 Dec 2021 12:30:54 -0800 |
Martin von Zweigbergk |
filemerge: remove `premerge` argument from `_makebackup()`
|
| Fri, 03 Dec 2021 22:45:35 -0800 |
Martin von Zweigbergk |
filemerge: inline `_filemerge()` into `filemerge()`
|
| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
| Fri, 03 Dec 2021 16:21:46 -0800 |
Martin von Zweigbergk |
filemerge: merge `premerge()` into `filemerge()`
|
| Fri, 03 Dec 2021 15:43:54 -0800 |
Martin von Zweigbergk |
mergestate: inline `_resolve()` into `resolve()`
|
| Fri, 03 Dec 2021 13:53:02 -0800 |
Martin von Zweigbergk |
mergestate: make `_resolve()` do both preresolve and resolve
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Fri, 03 Dec 2021 21:50:25 -0800 |
Martin von Zweigbergk |
tests: remove unnecessary explicit args from `failfilemerge.py`
|
| Mon, 29 Nov 2021 23:00:29 -0800 |
Martin von Zweigbergk |
simplemerge: set `conflicts` earlier for :union tool
|
| Mon, 18 Oct 2021 12:30:53 -0700 |
Martin von Zweigbergk |
chistedit: explain which order the commits are presented in
|
| Mon, 22 Nov 2021 17:21:55 -0800 |
Martin von Zweigbergk |
errors: use detailed error for invalid commit-extras argument
|
| Fri, 19 Nov 2021 16:21:00 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code in pathauditor
|
| Fri, 19 Nov 2021 16:16:21 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code for RepoLookupError
|
| Fri, 19 Nov 2021 15:40:56 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code for detected case-collision
|
| Fri, 19 Nov 2021 15:39:35 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code when trying to merge file outside narrowspec
|
| Fri, 19 Nov 2021 15:38:36 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code for non-integer number of diff context lines
|
| Fri, 19 Nov 2021 09:17:30 -0800 |
Martin von Zweigbergk |
patch: add hint about mangled whitespace on bad patch
|
| Fri, 19 Nov 2021 12:57:53 -0800 |
Martin von Zweigbergk |
errors: return more detailed errors when failing to parse or apply patch
|
| Fri, 19 Nov 2021 18:48:34 -0800 |
Martin von Zweigbergk |
filemerge: simplify slightly by using filectx.decodeddata()
|
| Fri, 19 Nov 2021 18:14:25 -0800 |
Martin von Zweigbergk |
filemerge: rename _formatconflictmarker() since it formats a label
|
| Wed, 10 Nov 2021 08:09:34 -0800 |
Martin von Zweigbergk |
ci: stop running with Python 2
|
| Wed, 10 Nov 2021 14:54:55 -0500 |
Augie Fackler |
merge: with stable
|
| Wed, 03 Nov 2021 14:11:11 -0700 |
Kyle Lippincott |
pyoxidizer: use in-memory resources on non-Windows platforms
|
| Mon, 01 Nov 2021 14:59:07 -0400 |
Augie Fackler |
merge: with stable
|
| Fri, 30 Apr 2021 16:00:40 -0700 |
Kyle Lippincott |
tests: allow Google's internal builds of clang-format to be used
stable
|
| Tue, 26 Oct 2021 10:23:14 -0400 |
Augie Fackler |
merge: with stable
|
| Tue, 19 Oct 2021 18:06:07 -0700 |
Kyle Lippincott |
tests: fix test-convert-git to work w/ "git pull" requiring strategy
|
| Tue, 19 Oct 2021 16:14:53 -0700 |
Kyle Lippincott |
merge-halt: fix issue with merge.on-failure=halt breaking unshelve
stable
|
| Tue, 19 Oct 2021 16:14:46 -0700 |
Kyle Lippincott |
merge-halt: demonstrate unshelve issue with merge.on-failure=halt
stable
|
| Mon, 18 Oct 2021 16:24:00 -0700 |
Kyle Lippincott |
pyoxidizer: update README.md with several small fixes
|
| Mon, 18 Oct 2021 16:18:41 -0700 |
Kyle Lippincott |
pyoxidizer: disable using in-memory resources
|
| Thu, 14 Oct 2021 10:58:39 -0700 |
Martin von Zweigbergk |
copy: recommend `--at-rev .` if target was added in parent commit
|
| Thu, 14 Oct 2021 22:35:46 -0700 |
Martin von Zweigbergk |
rhg: fix formatting error reported by test-check-format-rust.t
|
| Tue, 12 Oct 2021 13:54:06 -0700 |
Martin von Zweigbergk |
chistedit: add option to show order of commits in opposite order
|
| Thu, 14 Oct 2021 08:58:07 -0700 |
Martin von Zweigbergk |
narrow: raise StateError when working copy is stale (for detailed exit code)
|
| Tue, 12 Oct 2021 14:12:41 -0700 |
Martin von Zweigbergk |
chistedit: rename a confusingly named variable
|
| Tue, 12 Oct 2021 14:28:51 -0700 |
Martin von Zweigbergk |
chistedit: remove some local variable and access state on self instead
|
| Tue, 12 Oct 2021 09:41:11 -0700 |
Martin von Zweigbergk |
chistedit: move changeview() onto state class
|
| Tue, 12 Oct 2021 09:38:04 -0700 |
Martin von Zweigbergk |
chistedit: move cycleaction() onto state class
|
| Tue, 12 Oct 2021 09:22:29 -0700 |
Martin von Zweigbergk |
chistedit: move changeaction() onto state class
|
| Tue, 12 Oct 2021 09:20:46 -0700 |
Martin von Zweigbergk |
chistedit: move swap() onto state class
|
| Tue, 12 Oct 2021 09:17:59 -0700 |
Martin von Zweigbergk |
chistedit: move makeselection() onto state class
|
| Tue, 12 Oct 2021 09:16:14 -0700 |
Martin von Zweigbergk |
chistedit: move changemode() onto state class
|
| Tue, 12 Oct 2021 09:00:51 -0700 |
Martin von Zweigbergk |
chistedit: move movecursor() onto state class
|
| Tue, 12 Oct 2021 08:56:56 -0700 |
Martin von Zweigbergk |
chistedit: move patchcontents() onto state class
|
| Tue, 12 Oct 2021 08:55:19 -0700 |
Martin von Zweigbergk |
chistedit: move event() onto state class
|
| Mon, 11 Oct 2021 23:07:54 -0700 |
Martin von Zweigbergk |
chistedit: move renderpatch() and dependencies onto state class
|
| Mon, 11 Oct 2021 23:04:29 -0700 |
Martin von Zweigbergk |
chistedit: move renderrules() onto state class
|
| Mon, 11 Oct 2021 23:02:49 -0700 |
Martin von Zweigbergk |
chistedit: move layout() and dependencies onto state class
|
| Mon, 11 Oct 2021 22:51:58 -0700 |
Martin von Zweigbergk |
chistedit: move rendercommit() onto state class
|
| Mon, 11 Oct 2021 22:47:37 -0700 |
Martin von Zweigbergk |
chistedit: move view state from a dict to a custom class
|
| Tue, 02 Mar 2021 09:33:25 -0800 |
Martin von Zweigbergk |
dispatch: use detailed exit code 250 for keyboard interrupt
|
| Fri, 08 Oct 2021 13:36:02 -0700 |
Martin von Zweigbergk |
dispatch: ignore failure to flush ui
|
| Fri, 08 Oct 2021 13:34:33 -0700 |
Martin von Zweigbergk |
dispatch: don't change error status if flushing stdio fails
|
| Thu, 02 Sep 2021 14:08:45 -0700 |
Danny Hooper |
fix: reduce number of tool executions
|
| Thu, 02 Sep 2021 14:07:55 -0700 |
Danny Hooper |
fix: add test to demonstrate how many times tools are executed
|
| Thu, 07 Oct 2021 10:23:57 -0400 |
Augie Fackler |
merge: with stable
|
| Tue, 28 Sep 2021 15:11:22 -0700 |
Martin von Zweigbergk |
errors: raise InputError from revsingle() iff revset provided by the user
|
| Tue, 28 Sep 2021 13:59:01 -0700 |
Martin von Zweigbergk |
errors: raise InputError from revpair() iff revset provided by the user
|
| Tue, 28 Sep 2021 08:47:11 -0700 |
Martin von Zweigbergk |
errors: raise InputError on bad revset to revrange() iff provided by the user
|
| Tue, 28 Sep 2021 09:08:43 -0700 |
Martin von Zweigbergk |
phase: avoid a no-op resolution of revset from revnums
|
| Fri, 01 Oct 2021 08:44:56 -0700 |
Martin von Zweigbergk |
hg-core: silence dead-code warning by adding RevlogEntry::revion() accessor
|
| Tue, 28 Sep 2021 09:32:24 -0700 |
Martin von Zweigbergk |
histedit: use more specific exceptions for more detailed exit codes
|
| Tue, 28 Sep 2021 09:25:05 -0700 |
Martin von Zweigbergk |
histedit: remove redundant checks for unfinished histedit state
|
| Thu, 23 Sep 2021 09:42:20 -0700 |
Martin von Zweigbergk |
errors: use InputError for bad path arguments to `hg annotate`
|
| Thu, 23 Sep 2021 09:40:01 -0700 |
Martin von Zweigbergk |
errors: use InputError for bad --similarity value
|
| Thu, 23 Sep 2021 09:38:45 -0700 |
Martin von Zweigbergk |
errors: use InputError for some invalid revsets and such
|
| Thu, 23 Sep 2021 17:05:37 -0400 |
Augie Fackler |
merge: with stable
|
| Mon, 20 Sep 2021 15:51:23 -0400 |
Augie Fackler |
merge: with stable
|
| Thu, 16 Sep 2021 16:42:16 -0700 |
Martin von Zweigbergk |
dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`
|
| Thu, 16 Sep 2021 16:29:55 -0700 |
Martin von Zweigbergk |
dirstate: make dirstate flags char be unsigned
|
| Wed, 08 Sep 2021 15:59:48 -0400 |
Augie Fackler |
merge: with stable
|
| Tue, 07 Sep 2021 11:50:12 -0700 |
Kyle Lippincott |
filemerge: be more strict when detecting conflict markers, add `|` markers
stable
|
| Fri, 27 Aug 2021 13:51:44 -0700 |
Martin von Zweigbergk |
fix: again allow formatting the working copy while merging
stable 5.9.1
|
| Thu, 29 Jul 2021 16:23:45 -0400 |
Augie Fackler |
rewriteutil: fix crash when a rewritten message references f{6,64}
stable
|
| Thu, 29 Jul 2021 16:18:35 -0400 |
Augie Fackler |
tests: add explicit coverage for update_hash_refs from rewriteutil
stable
|
| Mon, 26 Jul 2021 15:02:23 -0700 |
Kyle Lippincott |
help: correct config.profiling.freq name (frequency->freq)
stable
|
| Thu, 29 Jul 2021 17:04:55 -0400 |
Augie Fackler |
git: restore basic functionality (issue6545)
stable
|
| Thu, 29 Jul 2021 17:03:35 -0400 |
Augie Fackler |
dirstate: fix typo in docstring
stable
|
| Mon, 11 Mar 2019 10:59:35 -0700 |
Martin von Zweigbergk |
fix: use scmutil.movedirstate() instead of reimplementing
stable
|
| Mon, 11 Mar 2019 10:56:56 -0700 |
Martin von Zweigbergk |
fix: rewrite writeworkingdir() to explicitly not work with merges
stable
|
| Thu, 22 Jul 2021 17:12:56 -0700 |
Martin von Zweigbergk |
tests: demonstrate bug in `hg fix` with incorrectly dirty working copy
stable
|
| Tue, 13 Jul 2021 11:37:57 -0400 |
Augie Fackler |
packaging: add command line flag to add extra vars to pyoxidizer
|
| Mon, 12 Jul 2021 15:56:25 -0400 |
Augie Fackler |
pyoxidizer: add hooks to inject extra python packages and install files
|
| Thu, 08 Jul 2021 17:09:57 -0400 |
Augie Fackler |
parsers: move DirstateItem to attr.s
|
| Fri, 02 Jul 2021 11:44:13 -0700 |
Daniel Ploch |
cmdutil: fix newandmodified file accounting for --interactive commits
|
| Tue, 29 Jun 2021 13:58:18 -0700 |
Martin von Zweigbergk |
tests: add test case for issue 6262
|
| Tue, 29 Jun 2021 14:02:34 -0700 |
Martin von Zweigbergk |
rewriteutil: look up common predecessor on unfiltered repo
|
| Wed, 07 Jul 2021 10:07:28 -0700 |
Martin von Zweigbergk |
tests: demonstrate crash when common predecessor of divergence is hidden
|
| Wed, 07 Jul 2021 11:48:08 -0400 |
Augie Fackler |
shallowutil: dedent code after the previous change
|
| Wed, 07 Jul 2021 11:47:02 -0400 |
Augie Fackler |
shallowutil: narrow scope of try/except block
|
| Wed, 07 Jul 2021 11:45:17 -0400 |
Augie Fackler |
remotefilelog: stop using RuntimeError for control flow
|
| Wed, 07 Jul 2021 13:20:47 -0400 |
Augie Fackler |
remotefilelog: tweak corrupt cache test to grep more flexibly
|
| Mon, 21 Jun 2021 10:01:55 -0700 |
Martin von Zweigbergk |
rebase: use str-keyed opts in remaining places
|
| Mon, 21 Jun 2021 09:54:36 -0700 |
Martin von Zweigbergk |
rebase: keep str-keyed opts long enough to make `action` a str
|
| Tue, 22 Jun 2021 08:24:27 -0700 |
Martin von Zweigbergk |
benchmarks: restore `output` variable lost in D10884
|
| Fri, 18 Jun 2021 16:03:42 -0700 |
Martin von Zweigbergk |
narrowbundle: use new context manager for silencing the ui
|
| Fri, 18 Jun 2021 16:00:58 -0700 |
Martin von Zweigbergk |
debugbackupbundle: use new context manager for silencing the ui
|
| Fri, 18 Jun 2021 15:48:51 -0700 |
Martin von Zweigbergk |
ui: add a context manager for silencing the ui (pushbuffer+popbuffer)
|
| Fri, 18 Jun 2021 14:17:43 -0700 |
Martin von Zweigbergk |
shelve: don't swallow errors that happen when reverting the working copy
|
| Fri, 18 Jun 2021 13:55:45 -0700 |
Martin von Zweigbergk |
histedit: don't swallow errors that happen when updating the working copy
|
| Fri, 18 Jun 2021 13:44:05 -0700 |
Martin von Zweigbergk |
histedit: don't record labels for output that we will discard
|
| Thu, 10 Jun 2021 15:56:55 -0700 |
Martin von Zweigbergk |
dog-raft: work with str-keyed opts throughout
|
| Thu, 10 Jun 2021 15:45:22 -0700 |
Martin von Zweigbergk |
cmdutil: make resolvecommitoptions() work on str-keyed opts
|
| Thu, 10 Jun 2021 14:55:10 -0700 |
Martin von Zweigbergk |
cmdutil: make amend() take str-keyed opts
|
| Thu, 10 Jun 2021 14:47:14 -0700 |
Martin von Zweigbergk |
commit: keep opts dict str-keyed a bit longer
|
| Thu, 10 Jun 2021 14:36:26 -0700 |
Martin von Zweigbergk |
dog-raft: keep opts dict str-keyed a bit longer
|
| Thu, 10 Jun 2021 14:25:16 -0700 |
Martin von Zweigbergk |
cmdutil: make checknotesize() work on str-keyed opts
|
| Thu, 10 Jun 2021 10:53:43 -0700 |
Martin von Zweigbergk |
amend: work mostly with str-type **opts for simplicity
|
| Mon, 07 Jun 2021 17:10:35 -0400 |
Augie Fackler |
merge: with stable
|
| Tue, 01 Jun 2021 22:38:29 -0700 |
Martin von Zweigbergk |
rewriteutil: add pointer to help text when rewrite would cause divergence
|
| Tue, 01 Jun 2021 15:19:08 -0700 |
Martin von Zweigbergk |
merge: make applyupdates() not mutate mresult argument
|
| Tue, 25 May 2021 16:46:32 -0700 |
Martin von Zweigbergk |
docket: make compatible with py3.6, where Struct.format is bytes
|
| Thu, 27 May 2021 12:10:59 -0400 |
Augie Fackler |
fuzz: add hg to sys.path when constructing mpatch corpus
|
| Thu, 20 May 2021 08:15:57 -0700 |
Martin von Zweigbergk |
errors: make exit codes class variables instead
|
| Tue, 18 May 2021 13:34:06 -0400 |
Augie Fackler |
hghave: make error output easier to diagnose
|
| Tue, 18 May 2021 13:24:41 -0400 |
Augie Fackler |
tests: add req on bash for test-transaction-rollback-on-sigpipe (issue6429)
|
| Tue, 18 May 2021 21:50:09 -0700 |
Martin von Zweigbergk |
errors: make StorageError subclass Error, attaching an exit code to it
|
| Tue, 18 May 2021 19:33:09 -0700 |
Martin von Zweigbergk |
revlog: avoid raising no-arg RevlogError for internal flow control
|
| Tue, 18 May 2021 21:45:59 -0700 |
Martin von Zweigbergk |
errors: catch the new Error class in scmutil and chgserver
|
| Tue, 18 May 2021 21:32:12 -0700 |
Martin von Zweigbergk |
errors: create superclass for Abort exception
|
| Tue, 18 May 2021 22:07:16 -0700 |
Martin von Zweigbergk |
errors: make InterventionRequired subclass Abort
|
| Tue, 18 May 2021 21:58:12 -0700 |
Martin von Zweigbergk |
errors: move Abort earlier, so more exceptions can subclass it
|
| Tue, 18 May 2021 17:15:49 -0700 |
Martin von Zweigbergk |
errors: let each Abort subclass define its error code
|
| Mon, 17 May 2021 15:15:44 -0700 |
Martin von Zweigbergk |
rewriteutil: add pointer to help text when rewrite would cause divergence
|
| Tue, 11 May 2021 12:22:26 -0700 |
Martin von Zweigbergk |
templates: fix `revset('parents()') % ...` in amend message template
|
| Fri, 07 May 2021 08:38:17 -0700 |
Martin von Zweigbergk |
rename: add hint about --at-rev if source file doesn't exist
|
| Tue, 04 May 2021 08:54:28 -0700 |
Martin von Zweigbergk |
config: add --source option to include source of value
|
| Tue, 04 May 2021 10:49:32 -0700 |
Martin von Zweigbergk |
rewriteutil: say how many commits would become orphan if commit is rewritten
|
| Tue, 04 May 2021 10:16:34 -0700 |
Martin von Zweigbergk |
rewriteutil: give examples of public changesets that can't be rewritten
|
| Fri, 30 Apr 2021 16:13:02 -0700 |
Kyle Lippincott |
black: make codebase compatible with black v21.4b2 and v20.8b1
stable
|
| Tue, 04 May 2021 13:28:42 -0400 |
Augie Fackler |
debugcommands: fix some plural-agreements I noticed
stable
|
| Mon, 03 May 2021 15:14:09 -0400 |
Augie Fackler |
merge: with stable
|
| Tue, 20 Apr 2021 11:22:35 -0700 |
Martin von Zweigbergk |
narrow: add more status messages when narrowing
|
| Tue, 20 Apr 2021 10:24:03 -0700 |
Martin von Zweigbergk |
narrow: add progress-reporting when looking for local changes in `hg tracked`
|
| Fri, 16 Apr 2021 16:21:26 -0700 |
Kyle Lippincott |
chg: pass --no-profile to disable profiling when starting hg serve
|
| Fri, 16 Apr 2021 15:31:05 -0700 |
Kyle Lippincott |
profiling: add --no-profile to disable profiling enabled via config
|
| Fri, 16 Apr 2021 18:56:26 -0700 |
Kyle Lippincott |
tests: fix test-chg to ignore a warning about being unable to set locale
|
| Tue, 27 Apr 2021 14:36:52 -0700 |
Martin von Zweigbergk |
branch: delete obsolete message about changing branch of obsolete commit
|
| Tue, 23 Feb 2021 10:28:42 -0800 |
Martin von Zweigbergk |
rewriteutil: check for divergence
|
| Wed, 28 Apr 2021 08:48:10 -0700 |
Martin von Zweigbergk |
rewriteutil: adapt "cannot %s while merging" to work with "change branch of"
|
| Thu, 11 Feb 2021 15:11:10 -0800 |
Martin von Zweigbergk |
rewriteutil: point to help about instability when rewriting creates orphan
|
| Tue, 27 Apr 2021 14:59:45 -0700 |
Martin von Zweigbergk |
help: add topic about evolution, based on text from evolve extension
|
| Thu, 11 Feb 2021 15:02:57 -0800 |
Martin von Zweigbergk |
rewriteutil: add devel warning if precheck is called with contexts
|
| Tue, 27 Apr 2021 11:02:41 -0700 |
Martin von Zweigbergk |
rewriteutil: replace "null changeset" by "the null revision" in error message
|
| Tue, 20 Apr 2021 08:28:11 -0700 |
Martin von Zweigbergk |
relnotes: copy contents of "next" to "5.8" and clear "next"
stable
|
| Tue, 20 Apr 2021 13:01:47 -0700 |
Kyle Lippincott |
dirstateguard: use mktemp-like functionality to generate the backup filenames
stable
|
| Wed, 21 Apr 2021 10:58:42 -0400 |
Augie Fackler |
merge: stable heads
stable
|
| Tue, 20 Apr 2021 11:01:06 -0400 |
Augie Fackler |
merge: default into stable for 5.8 rc
stable 5.8rc0
|
| Mon, 19 Apr 2021 21:31:24 -0700 |
Martin von Zweigbergk |
errors: remove unnecessary varargs handling from OutOfBandError
|
| Mon, 19 Apr 2021 16:53:45 -0700 |
Martin von Zweigbergk |
tests: make test-archive.t pass on py3.9 (issue6504)
|
| Mon, 19 Apr 2021 12:52:23 -0700 |
Martin von Zweigbergk |
errors: raise RemoteError in some places in exchange.py
|
| Mon, 19 Apr 2021 09:37:01 -0700 |
Martin von Zweigbergk |
errors: introduce a class for remote errors
|
| Mon, 19 Apr 2021 10:49:15 -0700 |
Martin von Zweigbergk |
errors: make OutOfBandError extend Abort
|
| Mon, 12 Apr 2021 19:25:34 -0700 |
Kyle Lippincott |
split: avoid strip if split is a no-op (identical to original)
|
| Mon, 12 Apr 2021 17:52:46 -0700 |
Kyle Lippincott |
split: fix issue with empty splits adjusting phases
|
| Mon, 12 Apr 2021 17:51:56 -0700 |
Kyle Lippincott |
split: add test demonstrating issue with empty splits adjusting phases
|
| Fri, 09 Apr 2021 08:46:40 -0700 |
Martin von Zweigbergk |
rename: add --forget option and stop suggesting `hg revert` for undoing
|
| Wed, 31 Mar 2021 12:46:54 -0700 |
Kyle Lippincott |
match: convert O(n) to O(log n) in exactmatcher.visitchildrenset
|
| Tue, 30 Mar 2021 13:05:22 -0700 |
Kyle Lippincott |
exthelper: improve docs to indicate what module vars are needed
|
| Thu, 25 Mar 2021 15:38:31 -0700 |
Martin von Zweigbergk |
tests: avoid using rebaseskipobsolete=0
|
| Thu, 25 Mar 2021 11:35:16 -0700 |
Martin von Zweigbergk |
rebase: when using --keep, don't care about pruned commits or divergence
|
| Thu, 25 Mar 2021 08:38:16 -0700 |
Martin von Zweigbergk |
rebase: remove duplicate initialization of a field
|
| Tue, 06 Apr 2021 14:21:03 -0700 |
Kyle Lippincott |
remotefilelog: include file contents in bundles produced during strip
|
| Tue, 06 Apr 2021 15:38:33 -0700 |
Kyle Lippincott |
tests: add test-remotefilelog-strip.t to demonstrate an issue with linknodes
|
| Tue, 30 Mar 2021 15:54:36 -0700 |
Kyle Lippincott |
deb: avoid use of [[ in 'rules' file
|
| Thu, 11 Feb 2021 21:23:05 -0800 |
Martin von Zweigbergk |
tests: update divergence test for `hg fix` to actually result in divergence
|
| Tue, 23 Mar 2021 22:48:27 -0700 |
Martin von Zweigbergk |
rebase: don't call rewriteutil.precheck() with to-be-skipped commits
|
| Tue, 23 Mar 2021 14:15:40 -0700 |
Martin von Zweigbergk |
reabase: call rewriteutil.precheck() a bit later
|
| Tue, 23 Mar 2021 14:49:31 -0700 |
Martin von Zweigbergk |
rebase: set `prepared = True` at very end of `_preparenewrebase()`
|
| Fri, 19 Mar 2021 22:52:59 -0700 |
Martin von Zweigbergk |
rebase: filter out descendants of divergence-causing commits earlier
|
| Fri, 19 Mar 2021 10:34:16 -0700 |
Martin von Zweigbergk |
rebase: clarify names of variables and function related to obsolete revisions
|
| Fri, 12 Feb 2021 16:05:02 -0800 |
Martin von Zweigbergk |
rebase: calculate obsolescense-related info earlier
|
| Fri, 12 Feb 2021 16:19:33 -0800 |
Martin von Zweigbergk |
rebase: let _handleskippingobsolete(self) read directly from self
|
| Tue, 23 Mar 2021 10:12:58 -0700 |
Martin von Zweigbergk |
tests: test divergence created during interrupted rebase
|
| Tue, 23 Mar 2021 09:13:29 -0700 |
Martin von Zweigbergk |
tests: split up test-rebase-obsolete.t in four pieces
|
| Mon, 22 Mar 2021 15:29:05 -0700 |
Martin von Zweigbergk |
fuzz: use Python 3 in makefile
|
| Mon, 22 Mar 2021 13:21:12 -0700 |
Martin von Zweigbergk |
makefile: use Python 3 by default when building docs as well
|
| Mon, 22 Mar 2021 13:14:11 -0700 |
Martin von Zweigbergk |
tests: replace some `python` by `"$PYTHON"` to not only use Python 2
|
| Fri, 19 Mar 2021 12:08:46 -0700 |
Martin von Zweigbergk |
rebase: skip obsolete commits even if they have pruned successors
|
| Fri, 19 Mar 2021 23:16:09 -0700 |
Martin von Zweigbergk |
bisect: use standard one-line commit summary
|
| Tue, 01 Dec 2020 12:59:33 -0500 |
Augie Fackler |
black: merge config into main pyproject.toml now that we have it
|
| Tue, 01 Dec 2020 12:52:04 -0500 |
Augie Fackler |
pyproject: add config file
|
| Tue, 26 Feb 2019 15:54:20 -0800 |
Martin von Zweigbergk |
amend: mark commit obsolete after moving working copy
|
| Fri, 12 Mar 2021 09:15:40 -0800 |
Martin von Zweigbergk |
split: close transaction in the unlikely event of a conflict while rebasing
|
| Fri, 12 Feb 2021 16:13:34 -0800 |
Martin von Zweigbergk |
rebase: inline simple function for finding obsolete subset of commits
|
| Fri, 12 Mar 2021 13:13:13 -0500 |
Augie Fackler |
merge: with stable
|
| Thu, 04 Mar 2021 08:20:19 -0800 |
Martin von Zweigbergk |
copies: filter out copies grafted from another branch
|
| Fri, 05 Mar 2021 14:26:56 -0800 |
Martin von Zweigbergk |
copies: inline _backwardrenames() in pathcopies()
|
| Fri, 05 Mar 2021 14:26:52 -0800 |
Martin von Zweigbergk |
copies: extract function _backwardcopies() for reversing renames
|
| Fri, 05 Mar 2021 10:16:44 -0800 |
Martin von Zweigbergk |
tests: demonstrate how grafted copies are counted when tracing across branches
|
| Thu, 04 Mar 2021 16:06:55 -0800 |
Martin von Zweigbergk |
copies: choose target directory based on longest match
|
| Fri, 29 Jan 2021 16:33:12 -0800 |
Martin von Zweigbergk |
errors: use more specific errors in rebase extension
|
| Thu, 04 Feb 2021 17:34:20 -0800 |
Kyle Lippincott |
debian: support a "chg-first" installation mechanism (hg is actually chg)
|
| Mon, 01 Mar 2021 14:44:29 -0800 |
Martin von Zweigbergk |
copies-rust: remove an unnecessary format!() inside assert!()
|
| Wed, 24 Feb 2021 09:27:33 -0800 |
Martin von Zweigbergk |
tests: correct a commit description in test-copies-chain-merge.t
|
| Wed, 24 Feb 2021 12:40:54 -0500 |
Augie Fackler |
fuzz: if the caller of our makefile sets CC and CXX, trust them
|
| Wed, 03 Feb 2021 16:33:10 -0800 |
Kyle Lippincott |
revlog: add a mechanism to verify expected file position before appending
|
| Tue, 23 Feb 2021 22:58:30 -0800 |
Martin von Zweigbergk |
narrow: remove assertion about working copy being clean
|
| Tue, 23 Feb 2021 22:55:26 -0800 |
Martin von Zweigbergk |
tests: demonstrate assertion error when modifying working copy while narrowing
|
| 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 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
|
| Thu, 04 Feb 2021 11:32:08 -0800 |
Kyle Lippincott |
tests: add a comment in a test that will hopefully save someone some time
|
| 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, 11 Feb 2021 20:36:46 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
| Tue, 09 Feb 2021 09:37:39 -0800 |
Martin von Zweigbergk |
wireprotopeer: clarify some variable names now that we allow snake_case
|
| 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
|
| Tue, 02 Feb 2021 13:25:28 -0500 |
Augie Fackler |
branching: merge with stable
|
| Fri, 29 Jan 2021 15:51:00 -0800 |
Martin von Zweigbergk |
errors: use InputError in uncommit extension
|
| 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
|
| Fri, 29 Jan 2021 10:32:19 -0800 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.7" and clear "next"
stable 5.7
|
| 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"
|
