| 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
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
|
file |
diff |
annotate
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
context: switch ctx() use to changectx()
|
file |
diff |
annotate
|
| Thu, 26 Oct 2017 11:07:06 -0700 |
Kostia Balytskyi |
filemerge: pass a default value to _toolstr (issue5718)
stable
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 14:15:46 -0700 |
Joe Blaylock |
help: fix typo in hg merge documentation
stable
|
file |
diff |
annotate
|
| Sun, 08 Oct 2017 20:37:13 +0200 |
Boris Feld |
configitems: register the full 'merge-tools' config and sub-options
|
file |
diff |
annotate
|
| Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
merge: allow user to halt merge on merge-tool failures
|
file |
diff |
annotate
|
| Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
filemerge: introduce functions to halt merge flow
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
filemerge: add a missing flushall()
|
file |
diff |
annotate
|
| Fri, 13 Oct 2017 12:34:22 -0700 |
Phil Cohen |
filemerge: store backups in the overlayworkingctx if using imm
|
file |
diff |
annotate
|
| Mon, 16 Oct 2017 13:10:55 -0700 |
Phil Cohen |
filemerge: use arbitraryfilectx for backups
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 04:48:06 +0530 |
Pulkit Goyal |
py3: use '%d' for integers instead of '%s'
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
filemerge: flush if using deferred writes when running a merge tool
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: pass wctx to premerge, filemerge
|
file |
diff |
annotate
|
| Tue, 05 Sep 2017 12:04:02 -0700 |
Phil Cohen |
filemerge: use fctx.write() in the internal:dump tool, instead of copy
|
file |
diff |
annotate
|
| Fri, 01 Sep 2017 10:35:43 -0700 |
Phil Cohen |
simplemerge: remove unused `repo` parameter
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: add _restorebackup
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: reduce creation of tempfiles until needed
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: add `_workingpath`
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: move a util copy call to filectx.write
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: eliminate most uses of tempfiles
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:05:19 -0700 |
Phil Cohen |
filemerge: extract _maketemp and _makebackup
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: stop accepting, and passing, file parameters
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
filemerge: pass contexts to simplemerge
|
file |
diff |
annotate
|
| Sun, 06 Aug 2017 01:13:57 +0900 |
FUJIWARA Katsunori |
filemerge: move decorator definition for internal merge tools to registrar
|
file |
diff |
annotate
|
| Fri, 30 Jun 2017 03:44:56 +0200 |
Boris Feld |
configitems: register the 'ui.mergemarkertemplate' config
|
file |
diff |
annotate
|
| Fri, 14 Jul 2017 14:22:40 -0700 |
Jun Wu |
codemod: register core configitems using a script
|
file |
diff |
annotate
|
| Mon, 26 Jun 2017 22:52:15 -0700 |
Phil Cohen |
filemerge: convert a couple of wvfs calls in internal mergetools to contexts
|
file |
diff |
annotate
|
| Sat, 22 Apr 2017 19:56:47 +0900 |
Yuya Nishihara |
templater: add simple interface for unnamed template (API)
|
file |
diff |
annotate
|
| Fri, 02 Jun 2017 16:57:21 +0530 |
Pulkit Goyal |
py3: convert bool variables to bytes
|
file |
diff |
annotate
|
| Fri, 19 May 2017 03:47:43 -0700 |
Stanislau Hlebik |
filemerge: store error messages in module variables
|
file |
diff |
annotate
|
| Sat, 13 May 2017 03:31:42 +0900 |
FUJIWARA Katsunori |
filemerge: add internal merge tool to dump files forcibly
|
file |
diff |
annotate
|
| Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: make warning message more i18n friendly
|
file |
diff |
annotate
|
| Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: show warning about choice of :prompt only at an actual fallback
|
file |
diff |
annotate
|
| Sat, 25 Feb 2017 19:36:02 +0900 |
Yuya Nishihara |
filemerge: optionally strip quotes from merge marker template (BC)
|
file |
diff |
annotate
|
| Wed, 15 Mar 2017 15:11:52 -0700 |
Pierre-Yves David |
filemerge: explicitly tests for None
|
file |
diff |
annotate
|
| Mon, 26 Dec 2016 16:54:33 -0700 |
Gregory Szorc |
filemerge: don't use mutable default argument value
|
file |
diff |
annotate
|
| Mon, 06 Mar 2017 03:19:40 -0800 |
Simon Farnsworth |
filemerge: tag merge tool for blocked times
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 20:06:38 +0530 |
Pulkit Goyal |
py3: convert the mode argument of os.fdopen to unicodes (1 of 2)
|
file |
diff |
annotate
|
| Thu, 09 Feb 2017 09:32:25 -0800 |
Martin von Zweigbergk |
merge: print status message before launching external merge tool
|
file |
diff |
annotate
|
| Sun, 18 Dec 2016 01:54:36 +0530 |
Pulkit Goyal |
py3: replace os.environ with encoding.environ (part 3 of 5)
|
file |
diff |
annotate
|
| Wed, 23 Nov 2016 23:47:38 +0100 |
Mads Kiilerich |
merge: use original file extension for temporary files
|
file |
diff |
annotate
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|