| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
file |
diff |
annotate
|
| Thu, 25 Mar 2021 18:02:08 +0100 |
Raphaël Gomès |
contributor: change mentions of mpm to olivia
|
file |
diff |
annotate
|
| Thu, 04 Feb 2021 13:05:51 -0800 |
Martin von Zweigbergk |
diff: replace --merge option by config option
|
file |
diff |
annotate
|
| Mon, 11 May 2020 18:45:45 -0400 |
Augie Fackler |
filemerge: add a hacktastic version of internal:merge3 for merge diffs
|
file |
diff |
annotate
|
| Tue, 19 Jan 2021 14:00:42 -0800 |
Martin von Zweigbergk |
resolve: also detect new :mergediff conflict markers
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 18:09:37 -0800 |
Martin von Zweigbergk |
filemerge: add support for the new "mergediff" marker style to premerge
|
file |
diff |
annotate
|
| Tue, 08 Dec 2020 16:45:13 -0800 |
Martin von Zweigbergk |
mergetools: add new conflict marker format with diffs in
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Mon, 26 Oct 2020 10:33:32 -0700 |
Martin von Zweigbergk |
config: move ui.pre-merge-tool-output-template into [command-templates]
|
file |
diff |
annotate
|
| Fri, 23 Oct 2020 15:59:32 -0700 |
Martin von Zweigbergk |
config: rename ui.mergemarkertemplate to command-templates.mergemarker
|
file |
diff |
annotate
|
| Thu, 28 May 2020 16:16:13 -0400 |
Augie Fackler |
filemerge: add __bytes__ for absentfilectx
|
file |
diff |
annotate
|
| Wed, 20 Nov 2019 13:03:22 -0500 |
Matt Harbison |
filemerge: fix a missing attribute usage
|
file |
diff |
annotate
|
| Wed, 20 Nov 2019 13:01:56 -0500 |
Matt Harbison |
filemerge: drop a default argument to appease pytype
|
file |
diff |
annotate
|
| Sun, 01 Dec 2019 18:46:10 -0500 |
Matt Harbison |
cleanup: fix docstring formatting
|
file |
diff |
annotate
|
| Thu, 07 Nov 2019 13:18:19 -0500 |
Augie Fackler |
cleanup: remove pointless r-prefixes on double-quoted strings
|
file |
diff |
annotate
|
| Tue, 08 Oct 2019 15:06:18 -0700 |
Martin von Zweigbergk |
cleanup: join string literals that are already on one line
|
file |
diff |
annotate
|
| Mon, 07 Oct 2019 00:04:04 -0400 |
Gregory Szorc |
py3: finish porting iteritems() to pycompat and remove source transformer
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 16:55:18 -0400 |
Gregory Szorc |
py3: manually import getattr where it is needed
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 13:28:56 -0400 |
Gregory Szorc |
py3: manually import pycompat.open into files that need it
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
file |
diff |
annotate
|
| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:14:37 -0800 |
Martin von Zweigbergk |
filemerge: migrate to scmutil.backuppath()
|
file |
diff |
annotate
|
| Wed, 30 Jan 2019 12:05:43 -0800 |
Martin von Zweigbergk |
merge: respect ui.relative-paths
|
file |
diff |
annotate
|
| Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
file |
diff |
annotate
|
| Sat, 13 Oct 2018 07:49:20 -0700 |
Kyle Lippincott |
merge-tools: when calling external merge tool, describe the resolve inputs
|
file |
diff |
annotate
|
| Wed, 29 Aug 2018 22:53:44 -0400 |
Matt Harbison |
filemerge: fix an i18n comment typo
|
file |
diff |
annotate
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
file |
diff |
annotate
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
file |
diff |
annotate
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
file |
diff |
annotate
|
| Wed, 22 Aug 2018 14:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: avoid putting translated text into docstring
|
file |
diff |
annotate
|
| Wed, 22 Aug 2018 13:57:01 +0900 |
FUJIWARA Katsunori |
filemerge: make capability check for internal tools ignore merge-tools section
|
file |
diff |
annotate
|
| Tue, 14 Aug 2018 22:20:28 +0900 |
FUJIWARA Katsunori |
filemerge: show actual capabilities of internal merge tools
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 22:24:50 +0900 |
FUJIWARA Katsunori |
filemerge: add config knob to check capabilities of internal merge tools
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 22:24:38 +0900 |
FUJIWARA Katsunori |
filemerge: show warning if chosen tool has no binary files capability
|
file |
diff |
annotate
|
| Tue, 14 Aug 2018 20:15:51 +0900 |
FUJIWARA Katsunori |
filemerge: add the function to examine a capability of a internal tool
|
file |
diff |
annotate
|
| Tue, 14 Aug 2018 20:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: set actual capabilities of internal merge tools
|
file |
diff |
annotate
|
| Mon, 23 Jul 2018 22:51:53 -0700 |
Martin von Zweigbergk |
mergetool: warn if ui.merge points to nonexistent tool
|
file |
diff |
annotate
|
| Thu, 26 Jul 2018 17:11:03 -0700 |
Kyle Lippincott |
resolve: add option to warn/abort on -m with unresolved conflict markers
|
file |
diff |
annotate
|
| Sat, 26 May 2018 12:20:36 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkdtemp() to use bytes path
|
file |
diff |
annotate
|
| Sat, 26 May 2018 12:14:04 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkstemp() to use bytes path
|
file |
diff |
annotate
|
| Thu, 24 May 2018 15:56:47 -0600 |
hindlemail |
filemerge: don't pass function name as loadpath's module_name param
|
file |
diff |
annotate
|
| Wed, 16 May 2018 14:11:41 -0600 |
hindlemail |
filemerge: support specifying a python function to custom merge-tools
|
file |
diff |
annotate
|
| Sat, 24 Mar 2018 15:10:51 +0900 |
Yuya Nishihara |
procutil: bulk-replace function calls to point to new module
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 21:56:20 +0900 |
Yuya Nishihara |
stringutil: bulk-replace call sites to point to new module
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 12:36:29 -0700 |
Kyle Lippincott |
filemerge: make the 'local' path match the format that 'base' and 'other' use
|
file |
diff |
annotate
|
| Fri, 19 Jan 2018 19:07:58 -0800 |
Kyle Lippincott |
filemerge: use a single temp dir instead of temp files
|
file |
diff |
annotate
|
| Fri, 19 Jan 2018 19:14:09 -0800 |
Kyle Lippincott |
filemerge: move temp file unlinks to _maketempfiles
|
file |
diff |
annotate
|
| Sat, 17 Mar 2018 11:23:04 +0900 |
Yuya Nishihara |
templater: rename .render(mapping) to .renderdefault(mapping) (API)
|
file |
diff |
annotate
|
| Fri, 19 Jan 2018 18:52:50 -0800 |
Kyle Lippincott |
filemerge: give some variables in _xmerge more descriptive names
|
file |
diff |
annotate
|
| Sat, 10 Mar 2018 15:57:16 +0900 |
Yuya Nishihara |
py3: use r'' instead of sysstr('') to get around code transformer
|
file |
diff |
annotate
|
| Sun, 25 Feb 2018 23:09:58 -0500 |
Augie Fackler |
filemerge: do what the context __bytes__ does, but locally
|
file |
diff |
annotate
|
| Wed, 17 Jan 2018 17:35:05 -0800 |
Kyle Lippincott |
filemerge: support passing labels to external merge tools
|
file |
diff |
annotate
|
| Wed, 17 Jan 2018 20:09:52 -0500 |
Augie Fackler |
filemerge: fix regular expression pattern to be bytes
|
file |
diff |
annotate
|
| Thu, 04 Jan 2018 21:37:03 -0800 |
Phil Cohen |
filemerge: only write in-memory backup during premerge
|
file |
diff |
annotate
|
| Thu, 04 Jan 2018 21:36:58 -0800 |
Phil Cohen |
filemerge: fix backing up an in-memory file to a custom location
|
file |
diff |
annotate
|
| Fri, 22 Dec 2017 21:19:29 +0900 |
Yuya Nishihara |
templater: register keywords to defaults table
|
file |
diff |
annotate
|
| Fri, 22 Dec 2017 21:22:49 +0900 |
Yuya Nishihara |
templater: drop unneeded resources from conflict-marker data
|
file |
diff |
annotate
|
| Thu, 21 Dec 2017 22:05:30 +0900 |
Yuya Nishihara |
templater: move repo, ui and cache to per-engine resources
|
file |
diff |
annotate
|
| Wed, 20 Dec 2017 17:22:16 -0600 |
Phil Cohen |
filemerge: only raise InMemoryMergeConflictsError when running _xmerge
|
file |
diff |
annotate
|