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"
|
Fri, 29 Jan 2021 16:26:53 -0800 |
Martin von Zweigbergk |
errors: use InputError for incorrectly formatted dates
|
Fri, 29 Jan 2021 15:56:08 -0800 |
Martin von Zweigbergk |
errors: use StateError more in merge module
|
Fri, 29 Jan 2021 12:16:55 -0800 |
Martin von Zweigbergk |
errors: use exit code 40 for when a hook fails
|
Fri, 29 Jan 2021 12:50:10 -0500 |
Augie Fackler |
context: add missing manifest invalidation after write in overlayworkingctx
|
Wed, 27 Jan 2021 10:29:21 -0800 |
Kyle Lippincott |
wix: tell ComponentSearch that it is finding a directory (not a file)
stable
|
Thu, 28 Jan 2021 00:14:15 -0800 |
Martin von Zweigbergk |
copies: fix an incorrect comment in graftcopies() from recent D9802
|
Wed, 27 Jan 2021 22:10:57 -0800 |
Martin von Zweigbergk |
narrow: delete a stale TODO about not sending groups the client already has
|
Fri, 22 Jan 2021 15:43:06 -0500 |
Augie Fackler |
histedit: rip out mysterious catch-all ignore curses.error handler
|
Fri, 22 Jan 2021 15:32:00 -0500 |
Augie Fackler |
histedit: notice when the main window underflows height and abort
|
Fri, 22 Jan 2021 15:29:12 -0500 |
Augie Fackler |
histedit: don't assign to _ for unused values
|
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
|
Mon, 11 May 2020 18:45:45 -0400 |
Augie Fackler |
filemerge: add a hacktastic version of internal:merge3 for merge diffs
|
Thu, 28 May 2020 17:31:41 -0400 |
Augie Fackler |
rebase: add a config knob for forcing in-memory rebasing
|
Mon, 18 May 2020 17:29:53 -0400 |
Augie Fackler |
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
|
Tue, 19 Jan 2021 14:00:42 -0800 |
Martin von Zweigbergk |
resolve: also detect new :mergediff conflict markers
|
Mon, 18 Jan 2021 22:32:09 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused find_unconflicted()
|
Tue, 19 Jan 2021 12:22:05 -0500 |
Augie Fackler |
merge with stable
|
Tue, 12 Jan 2021 09:11:15 -0800 |
Martin von Zweigbergk |
shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs
|
Tue, 12 Jan 2021 09:02:47 -0800 |
Martin von Zweigbergk |
shelve: also create class representing whole directory of shelves
|
Mon, 11 Jan 2021 23:08:37 -0800 |
Martin von Zweigbergk |
shelve: add a method for deleting shelf to new shelf class
|
Mon, 11 Jan 2021 10:53:42 -0800 |
Martin von Zweigbergk |
shelve: inline ".patch" constant now that it's only used in the Shelf class
|
Mon, 11 Jan 2021 23:06:45 -0800 |
Martin von Zweigbergk |
shelve: use listshelves() in cleanupoldbackups()
|
Mon, 11 Jan 2021 23:02:20 -0800 |
Martin von Zweigbergk |
shelve: make listshelves() list shelves in a given vfs
|
Tue, 12 Jan 2021 08:07:59 -0800 |
Martin von Zweigbergk |
shelve: replace repo instance in Shelf class by vfs instance
|
Mon, 11 Jan 2021 10:35:52 -0800 |
Martin von Zweigbergk |
shelve: use listdir() instead of readdir() when we don't need stat information
|
Fri, 08 Jan 2021 23:08:37 -0800 |
Martin von Zweigbergk |
shelve: don't crash on file with unexpected extension in .hg/shelved/
|
Mon, 11 Jan 2021 09:26:48 -0800 |
Martin von Zweigbergk |
shelve: don't include invalid shelves in `hg shelve --list`
|
Thu, 07 Jan 2021 23:32:19 -0800 |
Martin von Zweigbergk |
shelve: extract some repeated creation of shelf instances to variables
|
Thu, 07 Jan 2021 23:18:24 -0800 |
Martin von Zweigbergk |
shelve: teach new shelf class to check if .shelve file exists
|
Thu, 07 Jan 2021 22:45:17 -0800 |
Martin von Zweigbergk |
shelve: move method for creating backup to new shelf class
|
Thu, 07 Jan 2021 23:09:04 -0800 |
Martin von Zweigbergk |
shelve: make gennames() helper generate relative backup paths
|
Thu, 07 Jan 2021 22:38:19 -0800 |
Martin von Zweigbergk |
shelve: use listshelves() in cleanup function
|
Thu, 07 Jan 2021 16:08:30 -0800 |
Martin von Zweigbergk |
shelve: inline shelvedfile.filename() since there are no callers outside class
|
Thu, 07 Jan 2021 15:24:46 -0800 |
Martin von Zweigbergk |
shelve: make listshelves() return shelf names instead of filenames
|
Thu, 07 Jan 2021 14:54:56 -0800 |
Martin von Zweigbergk |
shelve: move method for getting stat (mtime) to new shelf class
|
Thu, 07 Jan 2021 15:24:15 -0800 |
Martin von Zweigbergk |
shelve: open patch using new shelf class instead of open()
|
Thu, 07 Jan 2021 14:48:57 -0800 |
Martin von Zweigbergk |
shelve: move function for opening .patch file to new shelf class
|
Thu, 07 Jan 2021 13:57:21 -0800 |
Martin von Zweigbergk |
shelve: move method for reading .hg to new shelf class
|
Thu, 07 Jan 2021 11:25:39 -0800 |
Martin von Zweigbergk |
shelve: move method for writing bundle to new shelf class
|
Thu, 07 Jan 2021 11:28:41 -0800 |
Martin von Zweigbergk |
shelve: move method for reading .shelve file to new shelf class
|
Thu, 07 Jan 2021 11:22:21 -0800 |
Martin von Zweigbergk |
shelve: move method for writing .shelve to new shelf class
|
Thu, 07 Jan 2021 11:07:21 -0800 |
Martin von Zweigbergk |
shelve: introduce class representing a shelf
|
Thu, 07 Jan 2021 12:26:32 -0800 |
Martin von Zweigbergk |
shelve: raise more specific errors
|
Thu, 07 Jan 2021 12:58:43 -0800 |
Martin von Zweigbergk |
shelve: trust caller of shelvedfile.opener() to check that the file exists
|
Thu, 07 Jan 2021 12:22:39 -0800 |
Martin von Zweigbergk |
shelve: rewrite check for unknown shelf to delete
|
Thu, 07 Jan 2021 12:37:14 -0800 |
Martin von Zweigbergk |
shelve: remove a bundlerepo method
|
Fri, 08 Jan 2021 16:38:41 -0800 |
Martin von Zweigbergk |
tests: add tests for corrupt .hg/shelved/ directory
|
Thu, 14 Jan 2021 11:53:55 -0800 |
Martin von Zweigbergk |
error: use detailed exit code 10 for command errors
|
Wed, 13 Jan 2021 22:37:21 -0800 |
Martin von Zweigbergk |
errors: raise InputError when non-existent help section requested
|
Fri, 15 Jan 2021 12:56:25 -0500 |
Augie Fackler |
revlog: migrate from PyEval_CallObject to PyObject_Call
|
Fri, 15 Jan 2021 12:52:52 -0500 |
Augie Fackler |
fuzz: fix Makefile default PYTHON_CONFIG_FLAGS to be modern
|
Wed, 13 Jan 2021 15:44:24 -0500 |
Augie Fackler |
fuzz: try and ensure fuzzer tests run against the right python-config
|
Mon, 11 Jan 2021 17:46:55 -0800 |
Kyle Lippincott |
patch: handle filenames with trailing spaces
|
Tue, 12 Jan 2021 17:32:08 -0800 |
Martin von Zweigbergk |
tests: make test-subrepo-git.t compatible with git's master->main rename
|
Sat, 02 Jan 2021 01:48:12 -0500 |
msuozzo |
beautifygraph: change the current commit symbol
|
Mon, 11 Jan 2021 14:10:31 -0500 |
Augie Fackler |
merge with stable
|
Thu, 17 Dec 2020 09:35:07 -0800 |
Martin von Zweigbergk |
relnotes: document that `hg extdiff` also got -r replaced by --from/--to
|
Thu, 17 Dec 2020 10:43:43 -0800 |
Martin von Zweigbergk |
errors: respect ui.detailed-exit-code in chg
|
Mon, 14 Dec 2020 18:09:37 -0800 |
Martin von Zweigbergk |
filemerge: add support for the new "mergediff" marker style to premerge
|
Wed, 16 Dec 2020 21:06:29 -0800 |
Martin von Zweigbergk |
extdiff: add --from/--to and deprecate -r, as was done for `hg diff`
|
Wed, 16 Dec 2020 22:30:07 -0800 |
Martin von Zweigbergk |
extdiff: fix crash when showing diff from wdir()
|
Wed, 16 Dec 2020 22:16:05 -0800 |
Martin von Zweigbergk |
extdiff: pass contexts instead of nodeids into diffrevs()
|
Wed, 16 Dec 2020 21:40:27 -0800 |
Martin von Zweigbergk |
tests: remove undefined (empty) $opt from test-extdiff.t
|
Thu, 12 Nov 2020 10:41:03 -0800 |
Martin von Zweigbergk |
errors: raise InputError on recursive template definition
|
Mon, 23 Nov 2020 16:39:53 -0800 |
Martin von Zweigbergk |
errors: raise StateError when push fails because it creates new heads
|
Mon, 23 Nov 2020 10:38:05 -0800 |
Martin von Zweigbergk |
errors: raise InputError on early parse error in dispatch
|
Wed, 18 Nov 2020 23:37:09 -0800 |
Martin von Zweigbergk |
errors: raise more specifc errors from narrowcommands
|
Wed, 09 Dec 2020 19:40:30 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code 50 for StorageError
|
Wed, 09 Dec 2020 20:22:25 -0800 |
Martin von Zweigbergk |
errors: raise InputError if an ambiguous revision id prefix is used
|
Thu, 10 Dec 2020 01:18:15 -0800 |
Martin von Zweigbergk |
localrepo: delete obsolete comment about `prefix in repo` raising exception
|
Sun, 13 Dec 2020 18:29:22 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
Fri, 11 Dec 2020 13:39:56 -0800 |
Kyle Lippincott |
copies: make calculating lazy for dir move detection's "addedfiles"
|
Tue, 08 Dec 2020 16:45:13 -0800 |
Martin von Zweigbergk |
mergetools: add new conflict marker format with diffs in
|
Thu, 10 Dec 2020 14:39:22 -0800 |
Martin von Zweigbergk |
diff: deprecate -r option
|
Thu, 10 Dec 2020 12:06:55 -0800 |
Martin von Zweigbergk |
diff: update synopsis to use --from/--to instead of -r
|
Thu, 10 Dec 2020 12:00:45 -0800 |
Martin von Zweigbergk |
diff: describe behavior by using --from/--to instead of varying revision count
|
Thu, 10 Dec 2020 13:15:15 -0500 |
Augie Fackler |
histedit: adjust comment describing `edit` action for clarity
|
Thu, 10 Dec 2020 11:42:49 -0500 |
Augie Fackler |
histedit: tweak `edit` message to try and guide users to our workflow
|
Wed, 09 Dec 2020 00:00:19 -0800 |
Martin von Zweigbergk |
simplemerge: write output only once it's complete
|
Tue, 08 Dec 2020 23:05:53 -0800 |
Martin von Zweigbergk |
simplemerge: avoid quadratic concatenation when building output text
|
Tue, 08 Dec 2020 22:59:17 -0800 |
Martin von Zweigbergk |
simplemerge: work with opts as native strings instead of bytes
|
Thu, 03 Dec 2020 14:39:39 -0800 |
Kyle Lippincott |
treemanifest: stop storing full path for each item in manifest._lazydirs
|
Wed, 09 Dec 2020 18:51:52 -0800 |
Martin von Zweigbergk |
docs: prefer `hg diff --from/--to` over `-r`
|
Wed, 09 Dec 2020 18:31:19 -0800 |
Martin von Zweigbergk |
diff: add --from and --to flags as clearer alternative to -r -r
|
Wed, 09 Dec 2020 09:54:49 -0800 |
Martin von Zweigbergk |
share: remove unexpected heading from "verbose" container in help test
|
Tue, 08 Dec 2020 13:33:40 -0800 |
Martin von Zweigbergk |
status: disable morestatus when using -0
|
Thu, 03 Dec 2020 13:23:59 -0800 |
Martin von Zweigbergk |
tests: update test-releasenotes-formatting.t with new exit codes
|
Thu, 03 Dec 2020 14:15:39 -0500 |
Augie Fackler |
merge with stable
|
Wed, 02 Dec 2020 15:39:01 -0800 |
Martin von Zweigbergk |
rebase: clear merge state when aborting in-memory merge on dirty working copy
stable 5.6.1
|
Wed, 02 Dec 2020 15:15:16 -0800 |
Martin von Zweigbergk |
tests: show that in-memory rebase leaves state when working copy is dirty
stable
|
Tue, 01 Dec 2020 01:18:21 -0500 |
Augie Fackler |
procutil: use rapply(tonativestr, ...) to preserve lists when they come in
stable
|
Wed, 02 Dec 2020 12:33:51 -0800 |
Kyle Lippincott |
statprof: separate functions and "line", assume 4 digit line numbers
|
Wed, 02 Dec 2020 15:38:05 -0800 |
Kyle Lippincott |
statprof: fix off-by-one-line error in output
|
Wed, 02 Dec 2020 11:05:53 -0800 |
Kyle Lippincott |
copies: avoid materializing a full directory map during copy tracing
|
Wed, 02 Dec 2020 15:39:01 -0800 |
Martin von Zweigbergk |
rebase: clear merge state when aborting in-memory merge on dirty working copy
|
Wed, 02 Dec 2020 15:15:16 -0800 |
Martin von Zweigbergk |
tests: show that in-memory rebase leaves state when working copy is dirty
|
Mon, 30 Nov 2020 12:30:58 -0800 |
Kyle Lippincott |
match: skip walking up the directory hierarchy if the number of pats are small
|
Mon, 30 Nov 2020 09:47:46 -0800 |
Martin von Zweigbergk |
tests: set old git default branch name for compatibility
|
Wed, 25 Nov 2020 11:08:28 -0500 |
Augie Fackler |
pyoxidizer: make sure defaultrc directory exists before trying to write to it
|
Mon, 23 Nov 2020 10:39:51 -0800 |
Martin von Zweigbergk |
errors: raise InputError on bad top-level flags
|
Mon, 23 Nov 2020 23:08:58 -0800 |
Martin von Zweigbergk |
errors: raise StateError on uncommitted changes when merge starts
|
Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
Mon, 23 Nov 2020 16:20:02 -0800 |
Martin von Zweigbergk |
errors: introduce SecurityError and use it in a few places
|
Mon, 23 Nov 2020 16:05:03 -0800 |
Martin von Zweigbergk |
errors: raise InputError when too few arguments given to alias
|
Tue, 17 Nov 2020 16:32:03 -0800 |
Martin von Zweigbergk |
errors: raise InputError on bad bookmark argument
|
Mon, 23 Nov 2020 12:27:22 -0800 |
Martin von Zweigbergk |
errors: raise ConfigError on bad alias definition
|
Mon, 23 Nov 2020 10:42:03 -0800 |
Martin von Zweigbergk |
errors: raise InputError on bad repo arguments
|
Mon, 23 Nov 2020 14:48:05 -0800 |
Martin von Zweigbergk |
errors: drop trailing "!" for some errors about bookmarks
|
Mon, 23 Nov 2020 12:47:08 -0800 |
Martin von Zweigbergk |
errors: remove trailing "!" in messages about bad top-level args
|
Mon, 23 Nov 2020 12:42:57 -0800 |
Martin von Zweigbergk |
errors: remove trailing "!" in messages about creating new heads on push
|
Mon, 23 Nov 2020 12:31:53 -0800 |
Martin von Zweigbergk |
errors: consistently don't use trailing "!" in "not found in manifest" message
|
Mon, 23 Nov 2020 11:18:48 -0800 |
Martin von Zweigbergk |
errors: remove trailing "!" from some error messages for consistency
|
Mon, 23 Nov 2020 11:56:10 -0800 |
Martin von Zweigbergk |
tests: make test-worker.t pass on py2
|
Mon, 23 Nov 2020 11:30:43 -0800 |
Martin von Zweigbergk |
tests: update test-https.t's #no-defaultcacertsloaded block with new exit code
|
Mon, 16 Nov 2020 16:00:50 -0800 |
Martin von Zweigbergk |
errors: use exit code 10 for parse errors
|
Fri, 20 Nov 2020 14:43:21 -0800 |
Martin von Zweigbergk |
errors: raise ConfigError on failure to parse config file
|
Mon, 16 Nov 2020 10:56:54 -0800 |
Martin von Zweigbergk |
histedit: don't crash if commit message is empty
|
Fri, 20 Nov 2020 10:34:26 -0800 |
Martin von Zweigbergk |
errors: remove ParseError.args
|
Fri, 20 Nov 2020 13:55:32 -0800 |
Martin von Zweigbergk |
errors: let ParseError use Abort.__bytes__
|
Fri, 20 Nov 2020 10:31:56 -0800 |
Martin von Zweigbergk |
config: clean up message about ignored untrusted config
|
Fri, 20 Nov 2020 10:22:58 -0800 |
Martin von Zweigbergk |
tests: use new ParseError.format() in test-trusted.py
|
Thu, 19 Nov 2020 15:13:39 -0800 |
Martin von Zweigbergk |
errors: make ParseError a subtype of Abort
|
Fri, 20 Nov 2020 13:24:45 -0800 |
Martin von Zweigbergk |
tests: make doctests not depend on str(ParseError()) format
|
Fri, 20 Nov 2020 09:17:38 -0800 |
Martin von Zweigbergk |
errors: format "abort: " text in a new Abort.format() method
|
Fri, 20 Nov 2020 08:51:45 -0800 |
Martin von Zweigbergk |
errors: make formatparse() an instance method on ParseError
|
Thu, 19 Nov 2020 11:23:59 -0800 |
Martin von Zweigbergk |
errors: create "similarity hint" for UnknownIdentifier eagerly in constructor
|
Thu, 19 Nov 2020 12:20:26 -0800 |
Martin von Zweigbergk |
errors: move similarity_hint() to error module
|
Thu, 19 Nov 2020 09:19:44 -0800 |
Martin von Zweigbergk |
errors: morph reportsimilar() into similarity_hint()
|
Thu, 19 Nov 2020 10:29:06 -0800 |
Martin von Zweigbergk |
errors: restructure formatparse() to clarify conditions a bit
|
Thu, 19 Nov 2020 14:55:55 -0500 |
Augie Fackler |
pyoxidizer: run buildifier
|
Tue, 17 Nov 2020 16:23:57 -0800 |
Martin von Zweigbergk |
errors: raise InputError in `hg absorb`
|
Thu, 22 Oct 2020 14:14:59 -0700 |
Martin von Zweigbergk |
errors: introduce CanceledError and use it in a few places
|
Tue, 17 Nov 2020 15:51:09 -0800 |
Martin von Zweigbergk |
errors: raise InputError in `hg split`
|
Tue, 17 Nov 2020 15:42:42 -0800 |
Martin von Zweigbergk |
errors: raise StateError in `hg bisect`
|
Tue, 17 Nov 2020 15:37:18 -0800 |
Martin von Zweigbergk |
errors: raise InputError in `hg debugobsolete`
|
Mon, 16 Nov 2020 16:25:04 -0800 |
Martin von Zweigbergk |
errors: raise InputError when line range to followlines() is out of bounds
|
Thu, 12 Nov 2020 14:07:34 -0800 |
Martin von Zweigbergk |
templates: define a {onelinesummary} keyword
|
Fri, 30 Oct 2020 12:46:38 -0700 |
Martin von Zweigbergk |
relnotes: document new [command-templates] section
|
Fri, 30 Oct 2020 13:26:18 -0700 |
Martin von Zweigbergk |
help: document the new [command-templates] config section
|
Mon, 16 Nov 2020 21:28:42 -0800 |
Martin von Zweigbergk |
shelve: clear merge state after partial shelve
|
Mon, 16 Nov 2020 22:38:36 -0800 |
Martin von Zweigbergk |
tests: show that interactive shelve can leave the repo with a merge state
|
Mon, 16 Nov 2020 10:30:53 -0800 |
Martin von Zweigbergk |
histedit: disable color while rendering template for use in plan
|
Mon, 16 Nov 2020 10:30:06 -0800 |
Martin von Zweigbergk |
tests: show how `hg histedit` can put color codes in histedit plan
|
Fri, 13 Nov 2020 09:41:49 -0800 |
Martin von Zweigbergk |
split: disable color while rendering template for use in commit message
|
Thu, 12 Nov 2020 17:06:45 -0800 |
Martin von Zweigbergk |
tests: show how `hg split` can put color codes in commit template
|
Mon, 16 Nov 2020 16:00:13 -0800 |
Martin von Zweigbergk |
dispatch: move some helper functions down into scmutil
|
Mon, 16 Nov 2020 15:11:51 -0800 |
Martin von Zweigbergk |
errors: raise more specific errors from rewriteutil
|
Thu, 12 Nov 2020 15:28:06 -0800 |
Martin von Zweigbergk |
errors: use InputError for some errors on `hg clone`
|
Thu, 12 Nov 2020 13:22:40 -0800 |
Martin von Zweigbergk |
errors: raise InputError when given non-existent paths etc
|
Thu, 12 Nov 2020 10:35:33 -0800 |
Martin von Zweigbergk |
errors: use InputError for errors about bad label names (tags etc)
|
Thu, 12 Nov 2020 09:53:14 -0800 |
Martin von Zweigbergk |
errors: use InputError for errors about bad paths
|
Tue, 10 Nov 2020 09:14:01 -0800 |
Martin von Zweigbergk |
destutil: raise more specific error when histedit.defaultrev is empty
|
Tue, 20 Oct 2020 08:56:00 -0700 |
Martin von Zweigbergk |
errors: raise more specific errors when default remote not configured
|
Thu, 22 Oct 2020 13:56:01 -0700 |
Martin von Zweigbergk |
errors: set detailed exit code to 30 for config errors
|
Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
Thu, 22 Oct 2020 13:31:34 -0700 |
Martin von Zweigbergk |
errors: set detailed exit code to 100 for some remote errors
|
Thu, 12 Nov 2020 21:56:52 -0800 |
Martin von Zweigbergk |
errors: catch urllib errors specifically instead of using safehasattr()
|
Thu, 12 Nov 2020 08:29:55 -0800 |
Martin von Zweigbergk |
errors: raise InputError in fancyopts
|
Tue, 01 Sep 2020 11:03:47 -0400 |
Augie Fackler |
make: add a pyoxidizer target
|
Tue, 10 Nov 2020 12:44:15 -0500 |
Augie Fackler |
pyoxidizer: switch to modern config using run_command instead of run_mode
|
Tue, 03 Nov 2020 16:25:33 -0500 |
Augie Fackler |
pyoxidizer: default to one-file binary on non-Windows platforms
|
Mon, 09 Nov 2020 09:58:44 -0800 |
Martin von Zweigbergk |
tests: use python from environment in test-parseindex2.py
|
Thu, 22 Oct 2020 13:38:14 -0700 |
Martin von Zweigbergk |
errors: set detailed exit code to 20 for locking errors
|
Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError and use it from commands and cmdutil
|
Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
Sat, 07 Nov 2020 21:50:28 -0800 |
Martin von Zweigbergk |
worker: raise exception instead of calling sys.exit() with child's code
|
Tue, 03 Nov 2020 09:56:02 -0800 |
Martin von Zweigbergk |
config: read system hgrc in lexicographical order
|
Sat, 07 Nov 2020 15:02:53 -0500 |
Augie Fackler |
merge with stable
|
Tue, 03 Nov 2020 20:28:23 -0800 |
Martin von Zweigbergk |
hgweb: don't call sys.exit() in httpservice.run()
|
Tue, 03 Nov 2020 20:20:49 -0800 |
Martin von Zweigbergk |
serve: simply return instead of calling sys.exit() in `hg serve --stdio`
|
Tue, 03 Nov 2020 20:18:26 -0800 |
Martin von Zweigbergk |
httpservice: move sys.exit() out of serve_forever()
|
Mon, 22 Jun 2020 22:47:43 -0700 |
Martin von Zweigbergk |
copies: handle more cases where a file got replaced by a copy
|
Mon, 22 Jun 2020 22:47:33 -0700 |
Martin von Zweigbergk |
tests: test more cases where a file got replaced by a copy
|
Fri, 16 Oct 2020 16:00:32 -0700 |
Martin von Zweigbergk |
fix: only check for obsolete commits in the --rev case
|
Fri, 16 Oct 2020 15:02:46 -0700 |
Martin von Zweigbergk |
fix: don't include obsolete descendants with -s
|
Fri, 16 Oct 2020 11:15:00 -0700 |
Martin von Zweigbergk |
tests: add test showing how `hg fix -s` deals with obsolete and orphan nodes
|
Fri, 16 Oct 2020 15:05:43 -0700 |
Martin von Zweigbergk |
fix: suggest --source instead of --rev on empty revset
|
Mon, 02 Nov 2020 14:39:43 -0500 |
Augie Fackler |
merge with stable
|
Thu, 29 Oct 2020 09:03:08 -0700 |
Martin von Zweigbergk |
templates: include all non-branch namespaces in default one-line summary
|
Thu, 29 Oct 2020 00:17:12 -0700 |
Martin von Zweigbergk |
branching: merge with stable
|
Thu, 22 Oct 2020 23:35:04 -0700 |
Martin von Zweigbergk |
histedit: drop fallback to empty string from rendertemplate()
|
Wed, 14 Oct 2020 08:38:58 -0700 |
Martin von Zweigbergk |
tests: add notes about broken `hg log --follow <file>` with copies in extras
|
Thu, 22 Oct 2020 10:57:11 -0700 |
Martin von Zweigbergk |
config: move message about leading spaces in config to config.py
|
Thu, 22 Oct 2020 09:58:05 -0700 |
Martin von Zweigbergk |
errors: name arguments to ParseError constructor
|
Tue, 20 Oct 2020 08:58:20 -0700 |
Martin von Zweigbergk |
errors: remove unnecessary override of __bytes__ in RevlogError
|
Thu, 15 Oct 2020 22:23:02 -0700 |
Martin von Zweigbergk |
commit: leverage cmdutil.check_incompatible_arguments()
|
Tue, 27 Oct 2020 10:06:17 -0700 |
Martin von Zweigbergk |
split: use default one-line summary
|
Tue, 27 Oct 2020 10:22:36 -0700 |
Martin von Zweigbergk |
phabsend: use default one-line summary
|
Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
Thu, 22 Oct 2020 23:10:06 -0700 |
Martin von Zweigbergk |
rebase: make summary template configurable, with default to shared template
|
Thu, 22 Oct 2020 22:29:22 -0700 |
Martin von Zweigbergk |
rebase: use hard-coded template for one-line commit description
|
Mon, 26 Oct 2020 10:33:32 -0700 |
Martin von Zweigbergk |
config: move ui.pre-merge-tool-output-template into [command-templates]
|
Fri, 23 Oct 2020 15:59:32 -0700 |
Martin von Zweigbergk |
config: rename ui.mergemarkertemplate to command-templates.mergemarker
|
Fri, 23 Oct 2020 15:27:33 -0700 |
Martin von Zweigbergk |
config: rename ui.graphnodetemplate to command-templates.graphnode
|
Fri, 23 Oct 2020 10:56:18 -0700 |
Martin von Zweigbergk |
config: add a new [command-templates] section for templates defined by hg
|
Thu, 29 Oct 2020 11:37:22 -0700 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.6" and clear "next"
stable
|
Mon, 26 Oct 2020 10:08:22 -0700 |
Martin von Zweigbergk |
branching: merge with stable
|
Thu, 15 Oct 2020 22:57:30 -0700 |
Martin von Zweigbergk |
tag: leverage cmdutil.check_incompatible_arguments()
|
Thu, 15 Oct 2020 22:36:17 -0700 |
Martin von Zweigbergk |
serve: leverage cmdutil.check_incompatible_arguments()
|
Thu, 15 Oct 2020 22:36:08 -0700 |
Martin von Zweigbergk |
revert: leverage cmdutil.check_incompatible_arguments()
|
Thu, 15 Oct 2020 22:23:45 -0700 |
Martin von Zweigbergk |
incoming: leverage cmdutil.check_incompatible_arguments()
|
Thu, 15 Oct 2020 22:23:35 -0700 |
Martin von Zweigbergk |
grep: levarage cmdutil.check_incompatible_arguments()
|
Thu, 15 Oct 2020 21:48:43 -0700 |
Martin von Zweigbergk |
import: leverage cmdutil.check_incompatible_arguments()
|
Thu, 15 Oct 2020 21:44:03 -0700 |
Martin von Zweigbergk |
backout: leverage cmdutil.check_incompatible_arguments()
|
Mon, 12 Oct 2020 12:52:45 -0700 |
Martin von Zweigbergk |
transaction: use ProgrammingError for when an committed transaction is used
|
Thu, 15 Oct 2020 10:28:27 -0700 |
Martin von Zweigbergk |
copy: clarify in help text that `hg co --forget` takes a *destination* file
|
Wed, 14 Oct 2020 14:43:39 -0700 |
Kyle Lippincott |
record: when backing up, avoid generating very long filenames
|
Thu, 08 Oct 2020 09:54:38 -0700 |
Martin von Zweigbergk |
tests: run test-copies-chain-merge.t also with copies in changesets
|
Thu, 08 Oct 2020 08:12:47 -0700 |
Martin von Zweigbergk |
tests: add test of copies suggested by Pierre-Yves on D9159
|
Thu, 08 Oct 2020 15:09:28 -0700 |
Martin von Zweigbergk |
tests: update test-copies-chain-merge.t to not use empty files
|
Fri, 09 Oct 2020 09:17:47 -0700 |
Martin von Zweigbergk |
py3: convert an exception message to bytes
|
Fri, 09 Oct 2020 08:08:54 -0700 |
Martin von Zweigbergk |
tests: fix test-url.py on py3, broken by D9179
|
Thu, 08 Oct 2020 13:19:18 -0700 |
Martin von Zweigbergk |
tests: set git config using `git config` for simplicity
|
Thu, 08 Oct 2020 13:10:16 -0700 |
Martin von Zweigbergk |
tests: use `git init` instead of unusual synonym `git init-db`
|
Thu, 08 Oct 2020 13:37:31 -0700 |
Martin von Zweigbergk |
errors: name arguments to Abort constructor
|
Thu, 08 Oct 2020 15:35:44 -0700 |
Martin von Zweigbergk |
errors: stop passing non-strings to Abort's constructor
|
Tue, 06 Oct 2020 21:06:18 -0700 |
Martin von Zweigbergk |
errors: name arguments to UnknownCommand constructor
|
Tue, 06 Oct 2020 20:45:52 -0700 |
Martin von Zweigbergk |
errors: name arguments to AmbiguousCommand constructor
|
Tue, 06 Oct 2020 20:37:35 -0700 |
Martin von Zweigbergk |
errors: name arguments to CommandError constructor
|
Tue, 06 Oct 2020 21:52:27 -0700 |
Martin von Zweigbergk |
errors: move UnknownCommand and AmbiguousCommand near CommandError
|
Thu, 08 Oct 2020 23:19:01 -0700 |
Martin von Zweigbergk |
branching: merge with stable
|
Thu, 08 Oct 2020 23:14:41 -0700 |
Martin von Zweigbergk |
tests: back out accidentally queued changeset 0627cd03b1e9
|
Thu, 08 Oct 2020 13:45:56 -0700 |
Martin von Zweigbergk |
tests: fix test-check-module-imports.t broken by D9150
stable
|
Thu, 08 Oct 2020 13:16:14 -0700 |
Martin von Zweigbergk |
tests: make test-convert-git.t work across changed default branch name
stable
|
Tue, 06 Oct 2020 15:23:10 -0700 |
Martin von Zweigbergk |
tests: update test-copies-chain-merge.t to not use empty files
|
Fri, 02 Oct 2020 07:56:01 -0700 |
Martin von Zweigbergk |
branching: merge with stable
|
Thu, 01 Oct 2020 09:09:35 -0700 |
Martin von Zweigbergk |
rust: move rustfmt.toml to repo root so it can be used by `hg fix`
|
Mon, 28 Sep 2020 08:07:09 -0700 |
Martin von Zweigbergk |
updaterepo: add deprecation warning
|
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
|
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
|
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()
|
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 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
|
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
|
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 10:48:43 -0400 |
Augie Fackler |
merge with 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
|
Tue, 15 Sep 2020 11:33:26 -0700 |
Martin von Zweigbergk |
mergestate: extract overridable methods for making/restoring file backups
|
Wed, 16 Sep 2020 13:39:26 -0700 |
Martin von Zweigbergk |
mergestate: initialize all properties in __init__()
|
Thu, 17 Sep 2020 19:33:55 -0700 |
Martin von Zweigbergk |
mergestate: remove unnecessary clearing of `localctx` and `otherctx`
|
Wed, 16 Sep 2020 13:25:49 -0700 |
Martin von Zweigbergk |
mergestate: move most of of reset() into start()
|
Thu, 17 Sep 2020 09:23:21 -0700 |
Martin von Zweigbergk |
mergestate: make clean() only be about creating a clean mergestate
|
Wed, 16 Sep 2020 10:09:37 -0700 |
Martin von Zweigbergk |
mergestate: split up reset() for its two use cases
|
Tue, 15 Sep 2020 23:19:14 -0700 |
Martin von Zweigbergk |
mergestate: simplify reset(), knowing that `other` and `node` go together
|
Tue, 15 Sep 2020 22:40:26 -0700 |
Martin von Zweigbergk |
mergestate: make some callers not pass pointless node argument
|
Thu, 17 Sep 2020 09:56:05 -0700 |
Martin von Zweigbergk |
py3: don't risk passing a None value to error.ManifestLookupError()
|
Fri, 11 Sep 2020 15:52:06 -0700 |
Kyle Lippincott |
repo: avoid copying/updating a dict on every `repo.__getitem__`
|
Sat, 12 Sep 2020 11:18:12 -0700 |
Martin von Zweigbergk |
resourceutil: document when we expect to take the importlib.resouces code path
|
Thu, 10 Sep 2020 22:00:00 -0700 |
Martin von Zweigbergk |
templater: fix reading of templates in frozen binaries with py3 < 3.7
|
Fri, 11 Sep 2020 09:35:49 -0700 |
Martin von Zweigbergk |
histedit: cache description line
|
Fri, 11 Sep 2020 09:55:08 -0700 |
Martin von Zweigbergk |
tests: make emacs test less strict
|
Thu, 10 Sep 2020 13:12:34 -0700 |
Martin von Zweigbergk |
graphlog: use '%' only if there are *unresolved* conflicts
|
Wed, 09 Sep 2020 14:48:55 -0400 |
Augie Fackler |
hgdemandimport: bypass demandimport for _ast module (issue6407)
stable
|
Mon, 07 Sep 2020 15:20:31 -0400 |
Augie Fackler |
merge with stable
|
Tue, 01 Sep 2020 10:33:10 -0400 |
Augie Fackler |
genosxversion: don't give up if we can't find a path to hg libraries
stable
|
Tue, 01 Sep 2020 09:46:15 -0400 |
Augie Fackler |
merge with stable
|
Fri, 14 Aug 2020 20:45:49 -0700 |
Martin von Zweigbergk |
worker: don't expose readinto() on _blockingreader since pickle is picky
|
Tue, 18 Aug 2020 15:03:57 -0700 |
Martin von Zweigbergk |
commit: clear mergestate also with --amend (issue6304)
|
Tue, 18 Aug 2020 14:26:49 -0700 |
Martin von Zweigbergk |
tests: add test showing that merge state is not cleared by amend
|
Mon, 03 Aug 2020 23:41:50 -0700 |
Martin von Zweigbergk |
hgweb: minimize scope of a try-block in staticfile()
|
Mon, 03 Aug 2020 23:38:50 -0700 |
Martin von Zweigbergk |
hgweb: ignore web.templates config when guessing mime type for static content
|
Sat, 22 Aug 2020 16:03:44 -0700 |
Martin von Zweigbergk |
hgweb: let staticfile() look up path from default location unless provided
|
Mon, 03 Aug 2020 22:40:05 -0700 |
Martin von Zweigbergk |
hgweb: handle None from templatedir() equally bad in webcommands.py
|
Thu, 13 Aug 2020 10:37:25 -0700 |
Martin von Zweigbergk |
posixworker: avoid creating workers that end up getting no work
|
Mon, 10 Aug 2020 21:46:47 -0700 |
Martin von Zweigbergk |
revert: remove dangerous `parents` argument from `cmdutil.revert()`
|
Tue, 28 Jul 2020 09:58:28 -0700 |
Martin von Zweigbergk |
rename: add support for --at-rev, which marks as copy and removes the source
|
Fri, 24 Jul 2020 15:03:14 -0700 |
Kyle Lippincott |
tests: make test-install.t work on debian systems
|
Fri, 07 Aug 2020 21:59:43 -0700 |
Martin von Zweigbergk |
makefile: stop setting unused HGEXTDIR variable during osx build
|
Thu, 06 Aug 2020 10:53:00 -0700 |
Martin von Zweigbergk |
templater: teach template loader to use open_template() function
|
Thu, 06 Aug 2020 10:52:52 -0700 |
Martin von Zweigbergk |
templater: restructure open_template() a little to prepare for relative paths
|
Thu, 06 Aug 2020 09:50:10 -0700 |
Martin von Zweigbergk |
templater: add exception-raising version of open_template()
|
Wed, 05 Aug 2020 22:13:51 -0700 |
Martin von Zweigbergk |
templater: replace Py3-only exception types by super-types available in Py2
|
Wed, 05 Aug 2020 14:19:42 -0700 |
Martin von Zweigbergk |
hgweb: enable reading styles from resources in frozen binaries
|
Wed, 05 Aug 2020 14:03:45 -0700 |
Martin von Zweigbergk |
hgweb: rely on open_template()'s fallback to using templatedir()
|
Wed, 05 Aug 2020 14:03:14 -0700 |
Martin von Zweigbergk |
hgweb: open mapfile using templater.open_template()
|
Wed, 05 Aug 2020 13:58:30 -0700 |
Martin von Zweigbergk |
hgweb: simplify a constant-length list by converting to literal tuple
|
Wed, 05 Aug 2020 13:33:07 -0700 |
Martin von Zweigbergk |
hgweb: remove some accesses to private member uimod._unset
|
Thu, 30 Jul 2020 21:36:29 -0700 |
Martin von Zweigbergk |
templater: try to read %include in mapfiles from resources
|
Thu, 30 Jul 2020 15:29:06 -0700 |
Martin von Zweigbergk |
templater: unroll loop over mapfile directories
|
Tue, 04 Aug 2020 10:51:25 -0700 |
Martin von Zweigbergk |
templater: make open_template() read from resources if in frozen binary
|
Tue, 04 Aug 2020 13:22:00 -0700 |
Martin von Zweigbergk |
templater: pass opened file-like object to templatespec
|
Tue, 04 Aug 2020 13:21:29 -0700 |
Martin von Zweigbergk |
templater: replace templatepath() with function that also opens the file
|
Thu, 30 Jul 2020 13:44:06 -0700 |
Martin von Zweigbergk |
templater: start passing resource to read from into _readmapfile()
|
Tue, 04 Aug 2020 09:13:10 -0700 |
Martin von Zweigbergk |
templater: move stylemap() to hgweb_mod, since that's its only user
|
Mon, 03 Aug 2020 22:15:45 -0700 |
Martin von Zweigbergk |
hgweb: simplify staticfile() now that we always pass it a single directory
|
Fri, 31 Jul 2020 10:05:07 -0700 |
Martin von Zweigbergk |
packaging: include templates with their package as key in package_data
|
Fri, 31 Jul 2020 09:49:52 -0700 |
Martin von Zweigbergk |
packaging: mark mercurial.templates and subdirs as packages
|
Thu, 12 Dec 2019 12:41:01 -0800 |
Martin von Zweigbergk |
templates: add __init__.py files to templates/ dirs
|
Wed, 05 Aug 2020 13:36:50 -0400 |
Augie Fackler |
merge with stable
|
Thu, 30 Jul 2020 22:49:51 -0700 |
Martin von Zweigbergk |
packaging: delete unnecessary updating of `dirs` list
|
Sun, 02 Aug 2020 10:08:18 -0700 |
Martin von Zweigbergk |
packaging: make "mercurial.defaultrc" a key in package_data
|
Thu, 30 Jul 2020 12:22:41 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in hooklib
|
Mon, 20 Jul 2020 22:43:33 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in logcmdutil
|
Mon, 20 Jul 2020 21:33:28 -0700 |
Martin von Zweigbergk |
templatespec: move check for non-unicode to lower-level function
|
Mon, 20 Jul 2020 21:32:10 -0700 |
Martin von Zweigbergk |
templatespec: logcmdutil.templatespec() gets either template or mapfile
|
Thu, 16 Jul 2020 13:33:46 -0700 |
Martin von Zweigbergk |
templatespec: create a factory function for each type there is
|
Wed, 29 Jul 2020 10:42:09 -0700 |
Martin von Zweigbergk |
templater: stop accepting a single style to stylemap()
|
Thu, 23 Jul 2020 10:20:48 -0700 |
Martin von Zweigbergk |
formatter: inline a variable assigned from `templater.templater.frommapfile`
|
Wed, 22 Jul 2020 21:23:46 -0700 |
Martin von Zweigbergk |
templater: don't normalize path separators to '/' when interacting with OS
|
Thu, 23 Jul 2020 22:50:20 -0700 |
Martin von Zweigbergk |
formatter: remove now-unnecessary check for file-ness
|
Thu, 23 Jul 2020 22:47:55 -0700 |
Martin von Zweigbergk |
templater: make templatepath() not return directory paths
|
Thu, 23 Jul 2020 22:44:18 -0700 |
Martin von Zweigbergk |
tests: show unusual error message for `hg log --style coal`
|
Wed, 22 Jul 2020 10:34:24 -0700 |
Martin von Zweigbergk |
config: remove now-unused `abs` argument from `include` callback
|
Wed, 22 Jul 2020 10:32:28 -0700 |
Martin von Zweigbergk |
config: re-calculate absolute %include path in `include` callback
|
Wed, 22 Jul 2020 10:25:28 -0700 |
Martin von Zweigbergk |
subrepoutil: use relative path for looking up config `%include`s
|
Wed, 22 Jul 2020 00:13:02 -0700 |
Martin von Zweigbergk |
config: remove now-unused support for "includepaths"
|
Tue, 28 Jul 2020 11:11:14 -0700 |
Martin von Zweigbergk |
cleanup: fix bad formatting of state.py from D8811
|
Tue, 28 Jul 2020 10:19:49 -0700 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.5" and clear "next"
stable
|
Thu, 23 Jul 2020 22:06:36 -0700 |
Martin von Zweigbergk |
tests: add tests trying to use dir as style, as %include, and as __base__
|
Thu, 23 Jul 2020 22:06:31 -0700 |
Martin von Zweigbergk |
tests: fix mistaken copy&paste from commit 4489e9a22763
|
Fri, 24 Jul 2020 08:38:19 -0700 |
Martin von Zweigbergk |
fix: update documentation to reflect preference for --source over --rev
|
Fri, 24 Jul 2020 16:32:45 -0700 |
Kyle Lippincott |
tests: make check-py3-compat.py actually load the specified files correctly
|
Fri, 24 Jul 2020 12:13:10 -0700 |
Kyle Lippincott |
tests: virtualenv is only used on py2, rename and conditionalize
|
Thu, 23 Jul 2020 13:31:45 -0700 |
Kyle Lippincott |
morestatus: mention --stop even if not using --verbose
|
Fri, 24 Jul 2020 11:24:59 -0700 |
Martin von Zweigbergk |
templater: handle None returned from templatedir()
|
Wed, 22 Jul 2020 00:09:17 -0700 |
Martin von Zweigbergk |
templater: do search for include of unqualified builtin outside of config code
|
Tue, 21 Jul 2020 21:59:12 -0700 |
Martin von Zweigbergk |
templater: switch to lower-level config.parse() in _readmapfile()
|
Tue, 21 Jul 2020 23:50:42 -0700 |
Martin von Zweigbergk |
config: pass both relative and absolute paths to `include` callback
|
Wed, 22 Jul 2020 22:38:42 -0700 |
Martin von Zweigbergk |
tests: add test for bad template %include and __base__
|
Tue, 21 Jul 2020 22:52:22 -0700 |
Martin von Zweigbergk |
tests: add test for unqualified include of a built-in template map
|
Wed, 22 Jul 2020 22:09:38 -0400 |
Augie Fackler |
merge with stable
|
Tue, 21 Jul 2020 13:36:48 -0700 |
Martin von Zweigbergk |
hgweb: simplify now that we always have a single path
|
Tue, 21 Jul 2020 13:41:26 -0700 |
Martin von Zweigbergk |
templater: simplify stylemap() now that templatedir() returns a single path
|
Tue, 21 Jul 2020 13:11:49 -0700 |
Martin von Zweigbergk |
templater: make templatepaths() return a single path, or None
|
Tue, 21 Jul 2020 13:05:37 -0700 |
Martin von Zweigbergk |
templater: simplify templatepaths() to avoid iterating a singleton list
|
Tue, 14 Jul 2020 13:36:57 -0700 |
Daniel Ploch |
state: support validated declaration of nested unfinished ops
|
Fri, 17 Jul 2020 03:53:19 -0700 |
Rodrigo Damazio Bovendorp |
diff: move no-eol text constant to a common location
|
Fri, 17 Jul 2020 02:31:42 -0700 |
Rodrigo Damazio Bovendorp |
revert: fix interactive reverting of end-of-file newline changes
|
Tue, 14 Jul 2020 13:35:54 -0700 |
Daniel Ploch |
error: normalize "unresolved conflicts" error messages with a custom class
|
Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
Wed, 01 Apr 2020 08:42:00 -0500 |
Augie Fackler |
debugcommands: create new debugantivirusrunning command
|
Wed, 15 Jul 2020 13:19:09 -0700 |
Martin von Zweigbergk |
purge: classify as a "working directory management" command in help
|
Wed, 15 Jul 2020 22:24:02 -0700 |
Martin von Zweigbergk |
extensions: make `hg help extensions` list disabled extensions with PyOxidizer
|
Fri, 13 Dec 2019 22:20:03 -0800 |
Martin von Zweigbergk |
tests: avoid "magic" nodeids in test-rebase-legacy.t
|
Fri, 13 Dec 2019 22:08:18 -0800 |
Martin von Zweigbergk |
tests: avoid a "magic" nodeid in test-wireproto-command-lookup.t
|
Tue, 14 Jul 2020 11:28:06 -0700 |
Martin von Zweigbergk |
extensions: make `hg nonexistent` not crash with PyOxidizer
|
Wed, 15 Jul 2020 10:34:59 -0400 |
Augie Fackler |
merge with stable
|
Mon, 13 Jul 2020 13:06:12 -0400 |
Augie Fackler |
merge with stable
|
Thu, 09 Jul 2020 20:46:52 -0700 |
Rodrigo Damazio Bovendorp |
fix: prefetch file contents
|
Thu, 09 Jul 2020 20:45:35 -0700 |
Rodrigo Damazio Bovendorp |
fix: obtain base paths before starting workers
|
Thu, 09 Jul 2020 18:48:55 -0700 |
Rodrigo Damazio Bovendorp |
scmutil: allowing different files to be prefetched per revision
|
Mon, 06 Jul 2020 22:02:50 -0400 |
Augie Fackler |
merge with stable
|
Wed, 01 Jul 2020 14:28:12 -0400 |
Augie Fackler |
merge with stable
|
Thu, 25 Jun 2020 12:02:34 -0700 |
Martin von Zweigbergk |
locks: expect repo lock, not wlock, when writing to .hg/strip-backup/
|
Thu, 25 Jun 2020 13:37:56 -0700 |
Martin von Zweigbergk |
graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
|
Thu, 25 Jun 2020 13:29:05 -0700 |
Martin von Zweigbergk |
graft: leverage cmdutil.check_incompatible_arguments() for --no-commit
|
Thu, 25 Jun 2020 13:27:37 -0700 |
Martin von Zweigbergk |
graft: leverage cmdutil.check_at_most_one_arg() for --abort/--stop/--continue
|
Thu, 18 Jun 2020 10:48:27 -0700 |
Kyle Lippincott |
debian: support building a single deb for multiple py3 versions
|
Fri, 26 Jun 2020 11:20:58 -0400 |
Augie Fackler |
merge with stable
|
Thu, 25 Jun 2020 10:32:51 -0700 |
Martin von Zweigbergk |
merge with stable
|
Wed, 24 Jun 2020 23:17:56 -0700 |
Martin von Zweigbergk |
merge: don't grab wlock when merging in memory
|
Fri, 19 Jun 2020 09:27:02 -0700 |
Martin von Zweigbergk |
copies: implement __repr__ on branch_copies for debugging
|
Wed, 08 Jan 2020 11:33:41 -0500 |
Augie Fackler |
fuzz: tell manifest fuzzer about longer node hashes
|
Thu, 25 Jun 2020 00:06:23 -0700 |
Martin von Zweigbergk |
procutil: make recent fix for zombies compatible with py2
stable
|
Mon, 22 Jun 2020 22:15:57 -0700 |
Martin von Zweigbergk |
help: document meaning of '%' in graphlog output
stable
|
Wed, 17 Jun 2020 16:11:11 -0700 |
Kyle Lippincott |
py3: fix broken man page generation, it was generating `(default: NUL*)`
stable
|
Mon, 15 Jun 2020 15:14:16 -0400 |
Augie Fackler |
fuzz: add config knob for PYTHON_CONFIG_FLAGS
|
Mon, 15 Jun 2020 15:13:01 -0400 |
Augie Fackler |
pyutil: this has taken so long to fix, I'm using 3.8 now
|
Mon, 15 Jun 2020 12:00:15 -0400 |
Augie Fackler |
merge with stable
|
Tue, 09 Jun 2020 17:13:26 -0400 |
Augie Fackler |
git: add debug logging when there's a mismatch in the cached heads list
|
Fri, 05 Jun 2020 11:10:33 -0700 |
Martin von Zweigbergk |
merge: move an inspection of the dirstate from record to calculate phase
|
Wed, 03 Jun 2020 12:04:38 -0700 |
Martin von Zweigbergk |
context: fix creation of ProgrammingError to not use non-existent field
|
Wed, 03 Jun 2020 22:07:26 -0700 |
Martin von Zweigbergk |
help: explain in `hg help flags` that unambiguous prefixes are allowed
|
Wed, 03 Jun 2020 11:28:57 -0400 |
Augie Fackler |
git: add coverage for manifest.diff() so we don't regress
|
Thu, 28 May 2020 09:51:13 -0400 |
Augie Fackler |
githelp: add some minimal help for pickaxe functionality
|
Thu, 28 May 2020 16:16:13 -0400 |
Augie Fackler |
filemerge: add __bytes__ for absentfilectx
|
Thu, 28 May 2020 16:17:28 -0400 |
Augie Fackler |
mergestate: move staticmethod _filectxorabsent to module level
|
Mon, 18 May 2020 16:00:26 -0400 |
Augie Fackler |
context: implement mergestate() method
|
Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
Mon, 18 May 2020 12:45:45 -0400 |
Augie Fackler |
tests: add coverage for repo.changelog.children() in the git extension
|
Mon, 18 May 2020 12:41:16 -0400 |
Augie Fackler |
tests: add coverage for repo.changelog.findmissing() in test-git-interop.t
|
Mon, 18 May 2020 13:18:05 -0400 |
Augie Fackler |
relnotes: add API change note per request in D8502
|
Tue, 26 May 2020 08:07:24 -0700 |
Martin von Zweigbergk |
merge with stable
|
Thu, 07 May 2020 16:56:03 -0400 |
Augie Fackler |
diff: avoid going from contexts to nodes and back
|
Mon, 18 May 2020 08:31:32 -0700 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.4" and clear "next"
stable
|
Thu, 07 May 2020 16:54:17 -0400 |
Augie Fackler |
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
|
Tue, 12 May 2020 13:06:34 -0700 |
Rodrigo Damazio Bovendorp |
pyoxidizer: formatting bazel definitions
|
Wed, 06 May 2020 11:40:17 -0700 |
Martin von Zweigbergk |
copy: give better error message when no source paths found with --at-rev
stable
|
Wed, 06 May 2020 11:41:37 -0700 |
Martin von Zweigbergk |
tests: show poor error message for `hg cp -A --at-rev . non-existent dst`
stable
|
Wed, 06 May 2020 10:33:56 -0700 |
Martin von Zweigbergk |
copy: to find copy source, walk parent of revision we're marking copies in
stable
|
Wed, 06 May 2020 11:41:01 -0700 |
Martin von Zweigbergk |
tests: show that `hg cp -A --at-rev .` doesn't work for renames
stable
|
Mon, 11 May 2020 09:07:31 -0700 |
Martin von Zweigbergk |
revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode
|
Fri, 08 May 2020 08:55:35 -0700 |
Martin von Zweigbergk |
status: use cmdutil.check_at_most_one_arg() for checking --rev/--change
|
Fri, 08 May 2020 08:50:47 -0700 |
Martin von Zweigbergk |
diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change
|
Wed, 06 May 2020 11:40:17 -0700 |
Martin von Zweigbergk |
copy: give better error message when no source paths found with --at-rev
|
Wed, 06 May 2020 11:41:37 -0700 |
Martin von Zweigbergk |
tests: show poor error message for `hg cp -A --at-rev . non-existent dst`
|
Wed, 06 May 2020 10:33:56 -0700 |
Martin von Zweigbergk |
copy: to find copy source, walk parent of revision we're marking copies in
|
Wed, 06 May 2020 11:41:01 -0700 |
Martin von Zweigbergk |
tests: show that `hg cp -A --at-rev .` doesn't work for renames
|
Tue, 21 Apr 2020 13:37:45 -0700 |
Kyle Lippincott |
locking: wait for locks in `hg cp` and `hg mv`
|
Thu, 07 May 2020 03:14:52 -0700 |
Rodrigo Damazio Bovendorp |
procutil: always waiting on child processes to prevent zombies with 'hg serve'
stable
|
Mon, 04 May 2020 10:06:53 -0400 |
Augie Fackler |
merge with stable
|
Fri, 01 May 2020 08:07:25 -0700 |
Martin von Zweigbergk |
merge with stable
|
Fri, 24 Apr 2020 15:06:42 -0400 |
Augie Fackler |
merge with stable
|
Mon, 20 Apr 2020 14:37:10 -0700 |
Martin von Zweigbergk |
commit: tell user what to do with .hg/last-message.txt
|
Thu, 02 Apr 2020 16:02:21 -0400 |
Augie Fackler |
manifest: leave a TODO where we may have more work for sha1 portability
|
Wed, 08 Jan 2020 11:33:01 -0500 |
Augie Fackler |
manifest: add test for long hashes
|
Thu, 02 Apr 2020 16:24:34 -0400 |
Augie Fackler |
manifest: remove a final 40-byte assumption from pure-python parser
|
Thu, 02 Apr 2020 16:01:36 -0400 |
Augie Fackler |
manifest: fix yet another 20-byte-hash assumption
|
Thu, 02 Apr 2020 15:57:07 -0400 |
Augie Fackler |
manifest: fix another pure-parsing 20-byte assumption
|
Thu, 02 Apr 2020 15:52:10 -0400 |
Augie Fackler |
manifest: teach treemanifest about long hashes
|
Tue, 07 Jan 2020 13:47:29 -0500 |
Augie Fackler |
manifest: start removing 40-byte hash restrictions from C code
|
Tue, 07 Jan 2020 11:25:13 -0500 |
Augie Fackler |
manifest: remove a 20-byte-hash assumption from pure manifest parsing
|
Thu, 09 Apr 2020 15:44:21 -0400 |
Augie Fackler |
histedit: add test that an invalid editor doesn't bork client state
|
Thu, 02 Apr 2020 13:53:33 -0700 |
Martin von Zweigbergk |
tests: move verification closer to setup in test-copies-chain-merge.t
|
Thu, 02 Apr 2020 13:45:10 -0700 |
Martin von Zweigbergk |
tests: collect all branch creation in one place in test-copies-chain-merge.t
|
Mon, 06 Apr 2020 15:19:09 -0700 |
Kyle Lippincott |
hgk: remove a "b" used on a kwargs expansion, the keys are strs
|
Wed, 01 Apr 2020 14:34:21 -0700 |
Martin von Zweigbergk |
rebase: don't create merge when continuing rebase interrupted by old hg
|
Wed, 01 Apr 2020 13:27:28 -0700 |
Martin von Zweigbergk |
tests: demonstrate how continuing rebase after upgrade can result in merge
|
Mon, 03 Feb 2020 22:17:19 -0500 |
Augie Fackler |
manifest: also declare treemanifest as implementing imanifestdict
|
Thu, 02 Apr 2020 13:04:41 -0400 |
Augie Fackler |
manifest: introduce new exception to signal unavailability of fastdelta()
|
Tue, 31 Mar 2020 16:14:10 -0400 |
Augie Fackler |
setup: work around old versions of distutils breaking setup.py
|
Thu, 26 Mar 2020 10:09:17 -0400 |
Augie Fackler |
tests: handle new error string from FreeBSD for dns entry not resolving
|
Wed, 01 Apr 2020 14:14:55 -0700 |
Kyle Lippincott |
histedit: add missing b prefix to a string
stable 5.3.2
|
Wed, 25 Mar 2020 12:06:49 -0400 |
Augie Fackler |
tests: update test-debugcommands.t stack trace checks for python3.9
|
Wed, 25 Mar 2020 12:05:53 -0400 |
Augie Fackler |
tests: update test-archive.t expectations for python3.9 changes
|
Wed, 25 Mar 2020 11:56:47 -0400 |
Augie Fackler |
setup: relax -Werror for declaration-after-statement on Python 3.9
|
Wed, 25 Mar 2020 18:50:40 -0700 |
Martin von Zweigbergk |
py3: require values in changelog extras to be bytes
stable
|
Wed, 25 Mar 2020 18:25:58 -0700 |
Martin von Zweigbergk |
py3: make setup.py's hgcommand() consistently return bytes
stable
|
Wed, 25 Mar 2020 08:28:20 -0700 |
Martin von Zweigbergk |
pvec: drop an unused `from __future__ import division`
|
Tue, 24 Mar 2020 23:31:36 -0700 |
Martin von Zweigbergk |
py3: use integer division in histedit
|
Mon, 23 Mar 2020 15:14:42 -0700 |
Martin von Zweigbergk |
shelve: split up dounshelve() in unshelvecmd() and _dounshelve()
|
Mon, 23 Mar 2020 14:38:00 -0700 |
Kyle Lippincott |
darwin: use vim, not vi, to avoid data-loss inducing posix behavior
stable
|
Fri, 13 Mar 2020 12:16:20 -0700 |
Martin von Zweigbergk |
fix: mark -r as advanced
|
Fri, 13 Mar 2020 12:16:00 -0700 |
Martin von Zweigbergk |
fix: add a -s option to format a revision and its descendants
|
Thu, 12 Dec 2019 16:32:01 -0800 |
Martin von Zweigbergk |
fix: move handling of --all into getrevstofix() for consistency
|
Wed, 18 Mar 2020 15:08:14 -0400 |
Augie Fackler |
hg: make _local() behave consistently on Python 3.8 (issue6287)
|
Tue, 17 Mar 2020 17:26:05 -0400 |
Augie Fackler |
remotefilelog: add fake heads() method that allows viewing a file in hgweb
|
Tue, 17 Mar 2020 17:21:34 -0400 |
Augie Fackler |
tests: add test for remotefilelog interactions with hgweb
|
Wed, 18 Mar 2020 12:03:27 -0400 |
Augie Fackler |
phabricator: remove duplicated byteskwargs conversion
|
Tue, 17 Mar 2020 12:59:31 -0700 |
Kyle Lippincott |
chistedit: support histedit.summary-template in curses histedit plan
|
Mon, 22 Jul 2019 09:58:23 -0700 |
Kyle Lippincott |
vfs: fix typo in comment (remove extra "l")
|
Thu, 12 Mar 2020 20:18:52 -0700 |
Kyle Lippincott |
tests: make test-doctest.t automatically find files to run tests on
|
Fri, 13 Mar 2020 19:25:37 -0700 |
Kyle Lippincott |
tests: make test-doctest.t module list match reality
|
Thu, 12 Mar 2020 20:08:05 -0700 |
Kyle Lippincott |
tests: remove doctest in narrowspec, it is broken
|
Thu, 12 Dec 2019 16:24:43 -0800 |
Martin von Zweigbergk |
fix: refactor getrevstofix() to define revisions first, then validate them
|
Fri, 13 Dec 2019 15:14:57 -0800 |
Martin von Zweigbergk |
fix: disallow `hg fix --all --working-dir`
|
Thu, 12 Mar 2020 16:25:22 -0700 |
Martin von Zweigbergk |
tests: simplify test-fix-topology.t slightly by using a `(case !)`
|
Thu, 12 Mar 2020 14:50:00 -0700 |
Martin von Zweigbergk |
tests: fix rebase test broken by earlier cleanup
|
Fri, 13 Mar 2020 16:57:38 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --base arguments (BC)
|
Fri, 13 Mar 2020 16:39:32 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --source arguments (BC)
|
Fri, 13 Mar 2020 19:29:02 -0700 |
Martin von Zweigbergk |
rebase: mention -r argument in synopsis
|
Fri, 13 Mar 2020 16:36:31 -0700 |
Martin von Zweigbergk |
rebase: remove unused defaults argument values from _definedestmap()
|
Mon, 09 Mar 2020 11:18:33 -0700 |
Martin von Zweigbergk |
git: don't fail import when pygit2 is not install
|
Mon, 09 Mar 2020 12:53:21 -0700 |
Martin von Zweigbergk |
hghave: add a check for pygit2
|
Fri, 06 Mar 2020 14:14:05 -0800 |
Martin von Zweigbergk |
git: make {shortest()} return shortest *unique* prefix
|
Tue, 11 Feb 2020 00:44:59 -0500 |
Augie Fackler |
git: skeleton of a new extension to _directly_ operate on git repos
|
Mon, 09 Mar 2020 10:18:40 -0700 |
Martin von Zweigbergk |
merge with stable
|
Fri, 06 Mar 2020 13:54:35 -0500 |
Augie Fackler |
nodemap: fix missing r-prefix on regular expression
|
Fri, 06 Mar 2020 13:27:41 -0500 |
Augie Fackler |
cleanup: run pyupgrade on our source tree to clean up varying things
|
Thu, 05 Mar 2020 08:37:08 -0800 |
Martin von Zweigbergk |
commit: print debug message when clearing dirstate and wdir clean
|
Thu, 05 Mar 2020 10:46:31 -0800 |
Martin von Zweigbergk |
merge with stable
|
Thu, 05 Mar 2020 10:52:51 -0500 |
Augie Fackler |
merge with stable
|
Wed, 04 Mar 2020 14:21:23 -0500 |
Augie Fackler |
commands: switch one call of check_at_most_one_arg to strings
|
Fri, 28 Feb 2020 11:32:27 -0800 |
Martin von Zweigbergk |
cleanup: remove redundant clearing of mergestate in rebase and shelve
|
Fri, 28 Feb 2020 11:32:02 -0800 |
Martin von Zweigbergk |
commit: clear resolved mergestate even if working copy is clean
|
Fri, 24 Jan 2020 15:51:19 -0800 |
Martin von Zweigbergk |
mq: don't tell user to commit merge that we already committed
|
Fri, 24 Jan 2020 15:28:37 -0800 |
Martin von Zweigbergk |
merge: make hg.merge() take a context instead of a node
|
Thu, 05 Mar 2020 08:30:11 -0800 |
Martin von Zweigbergk |
histedit: fix formatting after D8150
stable
|
Fri, 28 Feb 2020 10:30:18 -0800 |
Martin von Zweigbergk |
commit: error out on unresolved files even if commit would be empty
|
Fri, 28 Feb 2020 10:49:13 -0800 |
Martin von Zweigbergk |
tests: add test of committing with conflicts but no changes in wdir
|
Wed, 26 Feb 2020 10:48:56 -0800 |
Martin von Zweigbergk |
tests: use new, use-case-specific methods from merge module
|
Wed, 26 Feb 2020 10:40:31 -0800 |
Martin von Zweigbergk |
merge: introduce a merge() for that use-case
|
Wed, 26 Feb 2020 11:00:50 -0800 |
Martin von Zweigbergk |
merge: drop redundant mergeforce argument from hg.merge()
|
Wed, 26 Feb 2020 10:54:17 -0800 |
Martin von Zweigbergk |
merge: change default of hg.merge()'s "force" argument from None to False
|
Thu, 13 Feb 2020 21:14:20 -0800 |
Martin von Zweigbergk |
debugmergestate: make templated
|
Thu, 13 Feb 2020 21:55:38 -0800 |
Martin von Zweigbergk |
tests: add tests of debugmergestate with unresolved/resolved path conflicts
|
Thu, 13 Feb 2020 17:15:08 -0800 |
Martin von Zweigbergk |
mergestate: determine if active without looking for state files on disk
|
Thu, 13 Feb 2020 15:33:36 -0800 |
Martin von Zweigbergk |
pyoxidizer: allow extensions to be loaded from the file system
|
Tue, 25 Feb 2020 12:41:35 -0800 |
Martin von Zweigbergk |
drawdag: abide by new createmarkers() API
|
Mon, 24 Feb 2020 13:50:55 -0500 |
Augie Fackler |
merge with stable
|
Thu, 20 Feb 2020 15:15:23 -0800 |
Kyle Lippincott |
darwin: add another preemptive gui() call when using chg
|
Fri, 20 Dec 2019 13:24:46 -0800 |
Martin von Zweigbergk |
copy: add experimental support for marking committed copies
|
Thu, 26 Dec 2019 14:02:50 -0800 |
Martin von Zweigbergk |
copy: move argument validation a little earlier
|
Tue, 28 Jan 2020 14:07:57 -0800 |
Martin von Zweigbergk |
copy: add experimetal support for unmarking committed copies
|
Fri, 20 Dec 2019 15:50:13 -0800 |
Martin von Zweigbergk |
copy: add option to unmark file as copied
|
Thu, 26 Dec 2019 14:12:45 -0800 |
Martin von Zweigbergk |
copy: rename `wctx` to `ctx` since it will not necessarily be working copy
|
Fri, 20 Dec 2019 14:03:12 -0800 |
Martin von Zweigbergk |
copy: rewrite walkpat() to depend less on dirstate
|
Thu, 13 Feb 2020 10:12:12 -0800 |
Martin von Zweigbergk |
merge with stable
|
Tue, 11 Feb 2020 00:08:28 -0500 |
Augie Fackler |
context: use manifest.find() instead of two separate calls
|
Wed, 05 Feb 2020 17:13:51 -0500 |
Augie Fackler |
manifest: move matches method to be outside the interface
|
Mon, 10 Feb 2020 21:02:22 -0500 |
Augie Fackler |
tags: use modern // operator for division
|
Mon, 10 Feb 2020 20:47:19 -0500 |
Augie Fackler |
tags: fix some type confusion exposed in python 3
|
Fri, 10 Jan 2020 17:20:12 -0800 |
Martin von Zweigbergk |
rebase: remove some now-unused parent arguments
|
Fri, 10 Jan 2020 21:40:01 -0800 |
Martin von Zweigbergk |
rebase: remove some redundant setting of dirstate parents
|
Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
Fri, 10 Jan 2020 14:17:56 -0800 |
Martin von Zweigbergk |
rebase: stop relying on having two parents to resume rebase
|
Tue, 28 Jan 2020 21:49:50 -0800 |
Martin von Zweigbergk |
graphlog: use '%' for other context in merge conflict
|
Wed, 29 Jan 2020 14:42:54 -0800 |
Martin von Zweigbergk |
tests: add `hg log -G` output when there are merge conflicts
|
Wed, 29 Jan 2020 11:30:35 -0800 |
Martin von Zweigbergk |
revset: add a revset for parents in merge state
|
Fri, 10 Jan 2020 17:46:10 -0800 |
Martin von Zweigbergk |
tests: add test of rebase with conflict in merge commit
|
Thu, 16 Jan 2020 00:03:19 -0800 |
Martin von Zweigbergk |
rebase: always be graft-like, not merge-like, also for merges
|
Thu, 20 Feb 2020 16:21:00 -0800 |
Kyle Lippincott |
shelve: fix ordering of merge labels
stable
|
Thu, 20 Feb 2020 17:06:01 -0800 |
Kyle Lippincott |
shelve: add test clearly demonstrating that the conflict labels are backwards
stable
|
Mon, 10 Feb 2020 15:52:52 -0800 |
Martin von Zweigbergk |
tests: accept new bzr message about switching branches
stable
|
Mon, 10 Feb 2020 17:31:05 -0500 |
Augie Fackler |
cleanup: re-run black on the codebase
|
Mon, 10 Feb 2020 15:50:26 -0800 |
Martin von Zweigbergk |
tests: add workaround for bzr bug
stable
|
Wed, 05 Feb 2020 17:12:39 -0500 |
Augie Fackler |
merge: use manifestdict.walk() instead of manifestdict.matches()
|
Wed, 05 Feb 2020 16:58:50 -0500 |
Augie Fackler |
manifest: rewrite filesnotin to not make superfluous manifest copies
|
Thu, 06 Feb 2020 16:55:39 -0500 |
Augie Fackler |
archival: use walk() instead of matches() on manifest
|
Mon, 03 Feb 2020 11:56:02 -0500 |
Augie Fackler |
resourceutil: blacken
stable
|
Fri, 24 Jan 2020 14:11:43 -0800 |
Martin von Zweigbergk |
clean: delete obsolete unlinking of .hg/graftstate
|
Tue, 04 Feb 2020 10:16:30 -0800 |
Martin von Zweigbergk |
copies: avoid filtering by short-circuit dirstate-only copies earlier
|
Tue, 04 Feb 2020 10:14:44 -0800 |
Martin von Zweigbergk |
tests: add test showing that repo filter is calculated for `hg st --copies`
|
Wed, 15 Jan 2020 14:47:38 -0800 |
Martin von Zweigbergk |
merge: introduce a revert_to() for that use-case
|
Wed, 15 Jan 2020 15:30:25 -0800 |
Martin von Zweigbergk |
merge: introduce a clean_update() for that use-case
|
Wed, 05 Feb 2020 16:16:15 -0500 |
Augie Fackler |
manifest: fix _very_ subtle bug with exact matchers passed to walk()
|
Wed, 05 Feb 2020 15:15:18 -0500 |
Augie Fackler |
context: use manifest.walk() instead of manifest.match() to get file list
|
Wed, 05 Feb 2020 15:01:22 -0500 |
Augie Fackler |
manifest: remove `.new()` from the interface
|
Wed, 29 Jan 2020 13:39:50 -0800 |
Kyle Lippincott |
chg: force-set LC_CTYPE on server start to actual value from the environment
|
Mon, 03 Feb 2020 22:16:36 -0500 |
Augie Fackler |
manifest: remove optional default= argument on flags(path)
|
Thu, 06 Feb 2020 15:46:55 -0800 |
Kyle Lippincott |
py3: fully fix bundlepart.__repr__ to return str not bytes
stable
|
Thu, 02 Jan 2020 11:04:18 -0800 |
Kyle Lippincott |
py3: __repr__ needs to return str, not bytes
stable
|
Mon, 03 Feb 2020 11:56:02 -0500 |
Augie Fackler |
resourceutil: blacken
|
Mon, 03 Feb 2020 11:51:52 -0500 |
Augie Fackler |
merge with stable
|
Fri, 31 Jan 2020 10:53:50 -0800 |
Martin von Zweigbergk |
rebase: abort if the user tries to rebase the working copy
|
Fri, 31 Jan 2020 10:41:50 -0800 |
Martin von Zweigbergk |
tests: add tests for rebasing wdir() revision
|
Wed, 22 Jan 2020 13:29:26 -0800 |
Martin von Zweigbergk |
merge: when rename was made on both sides, use ancestor as merge base
|
Fri, 31 Jan 2020 08:47:32 -0800 |
Martin von Zweigbergk |
absorb: graduate -i flag from experimental
|
Wed, 29 Jan 2020 11:30:16 -0800 |
Martin von Zweigbergk |
mergestate: add accessors for local and other nodeid, not just contexts
|
Wed, 15 Jan 2020 22:24:16 -0800 |
Martin von Zweigbergk |
rebase: define base in only place in defineparents()
|
Fri, 20 Dec 2019 16:16:57 -0800 |
Martin von Zweigbergk |
tests: use full `uncommit` command name in tests
|
Tue, 28 Jan 2020 14:53:23 -0800 |
Martin von Zweigbergk |
graft: default `base` argument to common case of `ctx.p1()`
|
Fri, 10 Jan 2020 13:12:24 -0800 |
Martin von Zweigbergk |
graft: let caller pass in overlayworkingctx to merge.graft()
|
Wed, 29 Jan 2020 23:14:31 -0800 |
Martin von Zweigbergk |
copies: fix crash when copy source is not in graft base
|
Wed, 29 Jan 2020 23:05:02 -0800 |
Martin von Zweigbergk |
tests: add test showing crash when shelving ghosted rename target
|
Thu, 23 Jan 2020 15:44:30 -0800 |
Martin von Zweigbergk |
merge: start using the per-side copy dicts
|
Wed, 22 Jan 2020 14:35:30 -0800 |
Martin von Zweigbergk |
copies: define a type to return from mergecopies()
|
Wed, 22 Jan 2020 16:45:56 -0800 |
Martin von Zweigbergk |
merge: move initialization of copy dicts to one place
|
Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
Wed, 22 Jan 2020 15:31:17 -0800 |
Martin von Zweigbergk |
copies: make mergecopies() distinguish between copies on each side
|
Fri, 24 Jan 2020 17:25:40 -0800 |
Martin von Zweigbergk |
pathutil: mark parent directories as audited as we go
|
Mon, 27 Jan 2020 09:14:19 -0800 |
Martin von Zweigbergk |
cmdutil: change check_incompatible_arguments() *arg to single iterable
|
Mon, 27 Jan 2020 12:38:59 -0800 |
Martin von Zweigbergk |
rust: remove an unnecessary set of parentheses
|
Mon, 27 Jan 2020 18:16:05 -0800 |
Kyle Lippincott |
profiling: flush stdout before writing profile to stderr
|
Tue, 28 Jan 2020 10:40:19 -0800 |
Martin von Zweigbergk |
rust: re-format with nightly rustfmt
|
Fri, 24 Jan 2020 17:10:45 -0800 |
Martin von Zweigbergk |
pathauditor: drop a redundant call to bytes.lower()
|
Fri, 24 Jan 2020 15:18:19 -0800 |
Martin von Zweigbergk |
merge: replace a repo.lookup('.') by more typical repo['.'].node()
|
Fri, 24 Jan 2020 16:07:42 -0800 |
Martin von Zweigbergk |
merge: drop now-unused "abort" argument from hg.merge()
|
Fri, 24 Jan 2020 17:49:21 -0800 |
Martin von Zweigbergk |
merge: don't auto-pick destination with `hg merge 'wdir()'`
|
Fri, 24 Jan 2020 16:05:11 -0800 |
Martin von Zweigbergk |
merge: call hg.abortmerge() directly and return early
|
Fri, 24 Jan 2020 16:00:54 -0800 |
Martin von Zweigbergk |
merge: check that there are no conflicts after --abort
|
Fri, 24 Jan 2020 15:07:44 -0800 |
Martin von Zweigbergk |
merge: use check_incompatible_arguments() for --abort
|
Wed, 15 Jan 2020 17:15:45 -0800 |
Martin von Zweigbergk |
rebase: move some variables after an error cases where they're not needed
|
Wed, 15 Jan 2020 10:44:23 -0800 |
Martin von Zweigbergk |
rebase: clarify a little by calculating a set in Python instead of in revset
|
Wed, 15 Jan 2020 15:12:50 -0800 |
Martin von Zweigbergk |
merge: avoid a negation in the definition of updatedirstate
|
Fri, 24 Jan 2020 08:32:35 -0800 |
Martin von Zweigbergk |
merge: move definition of `partial` closer to where it's used
|
Wed, 22 Jan 2020 13:06:56 -0800 |
Martin von Zweigbergk |
copies: extract function for finding directory renames
|
Wed, 22 Jan 2020 15:23:30 -0800 |
Martin von Zweigbergk |
copies: avoid calculating debug-only stuff without --debug
|
Wed, 22 Jan 2020 15:20:12 -0800 |
Martin von Zweigbergk |
copies: move early return in mergecopies() earlier
|
Fri, 24 Jan 2020 07:00:45 -0800 |
Martin von Zweigbergk |
tests: test merge of renames of different sources to same target
|
Fri, 24 Jan 2020 09:33:02 -0800 |
Martin von Zweigbergk |
clean: check that there are no conflicts after
|
Fri, 24 Jan 2020 14:32:53 -0800 |
Martin von Zweigbergk |
progress: delete deprecated ui.progress()
|
Fri, 24 Jan 2020 11:05:42 -0500 |
Augie Fackler |
merge with stable
|
Wed, 15 Jan 2020 15:08:42 -0800 |
Martin von Zweigbergk |
merge: define updatedirstate a little earlier and reuse it
|
Wed, 15 Jan 2020 15:07:43 -0800 |
Martin von Zweigbergk |
merge: don't call update hook when using in-memory context
|
Thu, 23 Jan 2020 13:10:48 -0800 |
Martin von Zweigbergk |
merge with stable
|
Tue, 21 Jan 2020 15:45:06 -0800 |
Martin von Zweigbergk |
tests: move non-collapse test out of test-rebase-collapse
|
Tue, 21 Jan 2020 17:15:34 -0800 |
Kyle Lippincott |
crecord: fix a concatenation of bytes and str on py3
stable
|
Tue, 21 Jan 2020 10:27:39 -0800 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.3" and clear "next"
stable
|
Tue, 21 Jan 2020 12:10:35 -0800 |
Kyle Lippincott |
cext: change two more vars to Py_ssize_t in manifest.c
stable
|
Tue, 21 Jan 2020 13:14:51 -0500 |
Augie Fackler |
merge to stable for 5.3 release freeze
stable 5.3rc0
|
Thu, 16 Jan 2020 08:41:38 -0800 |
Martin von Zweigbergk |
examples: refer to nightly rustfmt in Windows-compatible way
|
Thu, 16 Jan 2020 12:27:15 -0800 |
Kyle Lippincott |
cext: fix compiler warning about sign changing
|
Thu, 16 Jan 2020 12:17:03 -0800 |
Kyle Lippincott |
py3: fix curses chunkselector fallback (when diffs are too large) on py3
|
Mon, 13 Jan 2020 11:18:29 -0800 |
Martin von Zweigbergk |
rebase: fix bug where `--collapse` would apply diff on missing file
|
Mon, 13 Jan 2020 11:11:20 -0800 |
Martin von Zweigbergk |
rebase: extract a variable for a repeated `repo[p1]`
|
Sun, 29 Dec 2019 17:53:48 -0800 |
Martin von Zweigbergk |
graftcopies: document why the function is useful at all
|
Fri, 27 Dec 2019 13:47:59 -0800 |
Martin von Zweigbergk |
graftcopies: remove `skip` and `repo` arguments
|
Fri, 27 Dec 2019 15:14:19 -0800 |
Martin von Zweigbergk |
graftcopies: use _filter() for filtering out invalid copies
|
Mon, 06 Jan 2020 15:24:36 -0800 |
Martin von Zweigbergk |
copies: replace duplicatecopies() by function that takes contexts
|
Fri, 27 Dec 2019 13:03:40 -0800 |
Martin von Zweigbergk |
graft: extract repo[None] to a variable
|
Tue, 14 Jan 2020 14:18:11 -0800 |
Martin von Zweigbergk |
packaging: leverage os.path.relpath() in setup.py
|
Wed, 08 Jan 2020 14:37:54 -0500 |
Augie Fackler |
revlog: run rustfmt nightly
|
Wed, 08 Jan 2020 14:37:01 -0500 |
Augie Fackler |
examples: specify rustfmt nightly using a $() construct
|
Mon, 13 Jan 2020 19:11:44 -0800 |
Rodrigo Damazio Bovendorp |
phases: make phasecache._phasesets immutable
|
Mon, 13 Jan 2020 19:06:36 -0800 |
Rodrigo Damazio Bovendorp |
phases: reduce code duplication in phasecache.getrevset
|
Mon, 13 Jan 2020 14:12:31 -0500 |
Augie Fackler |
hgext: replace references to hashlib.sha1 with hashutil.sha1
|
Mon, 13 Jan 2020 17:16:54 -0500 |
Augie Fackler |
sslutil: migrate to hashutil.sha1 instead of hashlib.sha1
|
Mon, 13 Jan 2020 17:15:14 -0500 |
Augie Fackler |
core: migrate uses of hashlib.sha1 to hashutil.sha1
|
Mon, 13 Jan 2020 17:14:19 -0500 |
Augie Fackler |
hashutil: new package for hashing-related features
|
Wed, 08 Jan 2020 15:59:52 -0500 |
Augie Fackler |
sha1dc: initial implementation of Python extension
|