| 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
|
| Thu, 10 Nov 2016 16:33:07 -0500 |
Augie Fackler |
filemerge: avoid shadowing a variable in a list comprehension
|
file |
diff |
annotate
|
| Sat, 08 Oct 2016 16:10:58 +0200 |
Pulkit Goyal |
py3: make format strings unicodes and not bytes
|
file |
diff |
annotate
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
file |
diff |
annotate
|
| Fri, 12 Aug 2016 06:01:42 -0700 |
Simon Farnsworth |
merge: use labels in prompts to the user
|
file |
diff |
annotate
|
| Tue, 05 May 2015 10:51:34 +0900 |
Yuya Nishihara |
merge: concatenate default conflict marker at parsing phase of .py
|
file |
diff |
annotate
|
| Sun, 10 Apr 2016 17:23:09 +0900 |
Yuya Nishihara |
templater: factor out function that creates templater from string template
|
file |
diff |
annotate
|
| Sun, 03 Apr 2016 23:26:48 +0900 |
Yuya Nishihara |
templater: separate function to create templater from map file (API)
|
file |
diff |
annotate
|
| Thu, 17 Mar 2016 00:36:01 +0000 |
timeless |
filemerge: use revset notation for p1/p2 of local/other descriptions
|
file |
diff |
annotate
|
| Thu, 17 Mar 2016 00:36:01 +0000 |
timeless |
filemerge: indicate that local/other are p1/p2
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
origpath: move from cmdutil to scmutil
|
file |
diff |
annotate
|
| Wed, 23 Dec 2015 12:51:45 -0800 |
Siddharth Agarwal |
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
|
file |
diff |
annotate
|
| Tue, 01 Dec 2015 09:48:38 -0800 |
Siddharth Agarwal |
filemerge: default regular prompts to 'leave unresolved' (BC)
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 11:17:18 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to regular prompts
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
file |
diff |
annotate
|
| Tue, 24 Nov 2015 10:58:35 -0800 |
Siddharth Agarwal |
filemerge: in ':prompt', use ':fail' tool rather than returning directly
|
file |
diff |
annotate
|
| Tue, 24 Nov 2015 10:57:01 -0800 |
Siddharth Agarwal |
filemerge: in ':fail' tool, write out other side if local side is deleted
|
file |
diff |
annotate
|
| Sat, 14 Nov 2015 00:00:46 -0800 |
Siddharth Agarwal |
filemerge: don't try to copy files known to be absent
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:57:43 -0800 |
Siddharth Agarwal |
filemerge: don't try using external tools on change/delete conflicts
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:56:00 -0800 |
Siddharth Agarwal |
filemerge: don't attempt to premerge change/delete conflicts
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:58:05 -0800 |
Siddharth Agarwal |
filemerge._mergecheck: add check for change/delete conflicts
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 21:40:15 -0800 |
Siddharth Agarwal |
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
|
file |
diff |
annotate
|