| 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
|
