Mercurial > hg

log mercurial/filemerge.py @ 46263:d46646ce3158

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
Mon, 14 Dec 2020 18:09:37 -0800 Martin von Zweigbergk filemerge: add support for the new "mergediff" marker style to premerge
Tue, 08 Dec 2020 16:45:13 -0800 Martin von Zweigbergk mergetools: add new conflict marker format with diffs in
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
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
Thu, 28 May 2020 16:16:13 -0400 Augie Fackler filemerge: add __bytes__ for absentfilectx
Wed, 20 Nov 2019 13:03:22 -0500 Matt Harbison filemerge: fix a missing attribute usage
Wed, 20 Nov 2019 13:01:56 -0500 Matt Harbison filemerge: drop a default argument to appease pytype
Sun, 01 Dec 2019 18:46:10 -0500 Matt Harbison cleanup: fix docstring formatting
Thu, 07 Nov 2019 13:18:19 -0500 Augie Fackler cleanup: remove pointless r-prefixes on double-quoted strings
Tue, 08 Oct 2019 15:06:18 -0700 Martin von Zweigbergk cleanup: join string literals that are already on one line
Mon, 07 Oct 2019 00:04:04 -0400 Gregory Szorc py3: finish porting iteritems() to pycompat and remove source transformer
Sun, 06 Oct 2019 16:55:18 -0400 Gregory Szorc py3: manually import getattr where it is needed
Sun, 06 Oct 2019 13:28:56 -0400 Gregory Szorc py3: manually import pycompat.open into files that need it
Sun, 06 Oct 2019 09:48:39 -0400 Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals
Sun, 06 Oct 2019 09:45:02 -0400 Augie Fackler formatting: blacken the codebase
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Mon, 04 Feb 2019 21:14:37 -0800 Martin von Zweigbergk filemerge: migrate to scmutil.backuppath()
Wed, 30 Jan 2019 12:05:43 -0800 Martin von Zweigbergk merge: respect ui.relative-paths
Thu, 17 Jan 2019 09:17:12 -0800 Martin von Zweigbergk cleanup: delete lots of unused local variables
Sat, 13 Oct 2018 07:49:20 -0700 Kyle Lippincott merge-tools: when calling external merge tool, describe the resolve inputs
Wed, 29 Aug 2018 22:53:44 -0400 Matt Harbison filemerge: fix an i18n comment typo
Sun, 26 Aug 2018 19:14:26 +0300 Pulkit Goyal filemerge: fix the wrong placements of messages in prompt
Sat, 25 Aug 2018 21:17:34 +0300 Pulkit Goyal filemerge: print the filename in quotes in prompt
Mon, 20 Aug 2018 13:29:48 -0400 Augie Fackler merge: improve interactive one-changed one-deleted message (issue5550)
Wed, 22 Aug 2018 14:08:27 +0900 FUJIWARA Katsunori filemerge: avoid putting translated text into docstring
Wed, 22 Aug 2018 13:57:01 +0900 FUJIWARA Katsunori filemerge: make capability check for internal tools ignore merge-tools section
Tue, 14 Aug 2018 22:20:28 +0900 FUJIWARA Katsunori filemerge: show actual capabilities of internal merge tools
Wed, 15 Aug 2018 22:24:50 +0900 FUJIWARA Katsunori filemerge: add config knob to check capabilities of internal merge tools
Wed, 15 Aug 2018 22:24:38 +0900 FUJIWARA Katsunori filemerge: show warning if chosen tool has no binary files capability
Tue, 14 Aug 2018 20:15:51 +0900 FUJIWARA Katsunori filemerge: add the function to examine a capability of a internal tool
Tue, 14 Aug 2018 20:08:27 +0900 FUJIWARA Katsunori filemerge: set actual capabilities of internal merge tools
Mon, 23 Jul 2018 22:51:53 -0700 Martin von Zweigbergk mergetool: warn if ui.merge points to nonexistent tool
Thu, 26 Jul 2018 17:11:03 -0700 Kyle Lippincott resolve: add option to warn/abort on -m with unresolved conflict markers
Sat, 26 May 2018 12:20:36 +0900 Yuya Nishihara py3: wrap tempfile.mkdtemp() to use bytes path
Sat, 26 May 2018 12:14:04 +0900 Yuya Nishihara py3: wrap tempfile.mkstemp() to use bytes path
Thu, 24 May 2018 15:56:47 -0600 hindlemail filemerge: don't pass function name as loadpath's module_name param
Wed, 16 May 2018 14:11:41 -0600 hindlemail filemerge: support specifying a python function to custom merge-tools
Sat, 24 Mar 2018 15:10:51 +0900 Yuya Nishihara procutil: bulk-replace function calls to point to new module
Thu, 22 Mar 2018 21:56:20 +0900 Yuya Nishihara stringutil: bulk-replace call sites to point to new module
Wed, 21 Mar 2018 12:36:29 -0700 Kyle Lippincott filemerge: make the 'local' path match the format that 'base' and 'other' use
Fri, 19 Jan 2018 19:07:58 -0800 Kyle Lippincott filemerge: use a single temp dir instead of temp files
Fri, 19 Jan 2018 19:14:09 -0800 Kyle Lippincott filemerge: move temp file unlinks to _maketempfiles
Sat, 17 Mar 2018 11:23:04 +0900 Yuya Nishihara templater: rename .render(mapping) to .renderdefault(mapping) (API)
Fri, 19 Jan 2018 18:52:50 -0800 Kyle Lippincott filemerge: give some variables in _xmerge more descriptive names
Sat, 10 Mar 2018 15:57:16 +0900 Yuya Nishihara py3: use r'' instead of sysstr('') to get around code transformer
Sun, 25 Feb 2018 23:09:58 -0500 Augie Fackler filemerge: do what the context __bytes__ does, but locally
Wed, 17 Jan 2018 17:35:05 -0800 Kyle Lippincott filemerge: support passing labels to external merge tools
Wed, 17 Jan 2018 20:09:52 -0500 Augie Fackler filemerge: fix regular expression pattern to be bytes
Thu, 04 Jan 2018 21:37:03 -0800 Phil Cohen filemerge: only write in-memory backup during premerge
Thu, 04 Jan 2018 21:36:58 -0800 Phil Cohen filemerge: fix backing up an in-memory file to a custom location
Fri, 22 Dec 2017 21:19:29 +0900 Yuya Nishihara templater: register keywords to defaults table
Fri, 22 Dec 2017 21:22:49 +0900 Yuya Nishihara templater: drop unneeded resources from conflict-marker data
Thu, 21 Dec 2017 22:05:30 +0900 Yuya Nishihara templater: move repo, ui and cache to per-engine resources
Wed, 20 Dec 2017 17:22:16 -0600 Phil Cohen filemerge: only raise InMemoryMergeConflictsError when running _xmerge
Fri, 01 Dec 2017 00:07:23 -0800 Phil Cohen filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Fri, 01 Dec 2017 00:07:23 -0800 Phil Cohen context: switch ctx() use to changectx()
Thu, 26 Oct 2017 11:07:06 -0700 Kostia Balytskyi filemerge: pass a default value to _toolstr (issue5718) stable
Fri, 20 Oct 2017 14:15:46 -0700 Joe Blaylock help: fix typo in hg merge documentation stable
Sun, 08 Oct 2017 20:37:13 +0200 Boris Feld configitems: register the full 'merge-tools' config and sub-options
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: allow user to halt merge on merge-tool failures
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy filemerge: introduce functions to halt merge flow
Sun, 15 Oct 2017 20:36:29 -0700 Phil Cohen filemerge: add a missing flushall()
Fri, 13 Oct 2017 12:34:22 -0700 Phil Cohen filemerge: store backups in the overlayworkingctx if using imm
Mon, 16 Oct 2017 13:10:55 -0700 Phil Cohen filemerge: use arbitraryfilectx for backups
Mon, 02 Oct 2017 04:48:06 +0530 Pulkit Goyal py3: use '%d' for integers instead of '%s'
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen filemerge: flush if using deferred writes when running a merge tool
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen merge: pass wctx to premerge, filemerge
Tue, 05 Sep 2017 12:04:02 -0700 Phil Cohen filemerge: use fctx.write() in the internal:dump tool, instead of copy
Fri, 01 Sep 2017 10:35:43 -0700 Phil Cohen simplemerge: remove unused `repo` parameter
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen filemerge: add _restorebackup
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen filemerge: reduce creation of tempfiles until needed
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen filemerge: add `_workingpath`
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen filemerge: move a util copy call to filectx.write
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen filemerge: eliminate most uses of tempfiles
Thu, 31 Aug 2017 11:05:19 -0700 Phil Cohen filemerge: extract _maketemp and _makebackup
Thu, 24 Aug 2017 21:30:51 -0700 Phil Cohen simplemerge: stop accepting, and passing, file parameters
Sun, 13 Aug 2017 20:06:52 -0700 Phil Cohen filemerge: pass contexts to simplemerge
Sun, 06 Aug 2017 01:13:57 +0900 FUJIWARA Katsunori filemerge: move decorator definition for internal merge tools to registrar
Fri, 30 Jun 2017 03:44:56 +0200 Boris Feld configitems: register the 'ui.mergemarkertemplate' config
Fri, 14 Jul 2017 14:22:40 -0700 Jun Wu codemod: register core configitems using a script
Mon, 26 Jun 2017 22:52:15 -0700 Phil Cohen filemerge: convert a couple of wvfs calls in internal mergetools to contexts
Sat, 22 Apr 2017 19:56:47 +0900 Yuya Nishihara templater: add simple interface for unnamed template (API)
Fri, 02 Jun 2017 16:57:21 +0530 Pulkit Goyal py3: convert bool variables to bytes
Fri, 19 May 2017 03:47:43 -0700 Stanislau Hlebik filemerge: store error messages in module variables
Sat, 13 May 2017 03:31:42 +0900 FUJIWARA Katsunori filemerge: add internal merge tool to dump files forcibly
Sat, 13 May 2017 03:28:36 +0900 FUJIWARA Katsunori filemerge: make warning message more i18n friendly
Sat, 13 May 2017 03:28:36 +0900 FUJIWARA Katsunori filemerge: show warning about choice of :prompt only at an actual fallback
Sat, 25 Feb 2017 19:36:02 +0900 Yuya Nishihara filemerge: optionally strip quotes from merge marker template (BC)
Wed, 15 Mar 2017 15:11:52 -0700 Pierre-Yves David filemerge: explicitly tests for None
Mon, 26 Dec 2016 16:54:33 -0700 Gregory Szorc filemerge: don't use mutable default argument value
Mon, 06 Mar 2017 03:19:40 -0800 Simon Farnsworth filemerge: tag merge tool for blocked times
Mon, 13 Feb 2017 20:06:38 +0530 Pulkit Goyal py3: convert the mode argument of os.fdopen to unicodes (1 of 2)
Thu, 09 Feb 2017 09:32:25 -0800 Martin von Zweigbergk merge: print status message before launching external merge tool
Sun, 18 Dec 2016 01:54:36 +0530 Pulkit Goyal py3: replace os.environ with encoding.environ (part 3 of 5)
Wed, 23 Nov 2016 23:47:38 +0100 Mads Kiilerich merge: use original file extension for temporary files
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers
Thu, 10 Nov 2016 16:33:07 -0500 Augie Fackler filemerge: avoid shadowing a variable in a list comprehension
Sat, 08 Oct 2016 16:10:58 +0200 Pulkit Goyal py3: make format strings unicodes and not bytes
Fri, 12 Aug 2016 05:56:40 -0700 Simon Farnsworth merge: always use other, not remote, in user prompts
Fri, 12 Aug 2016 06:01:42 -0700 Simon Farnsworth merge: use labels in prompts to the user
Tue, 05 May 2015 10:51:34 +0900 Yuya Nishihara merge: concatenate default conflict marker at parsing phase of .py
Sun, 10 Apr 2016 17:23:09 +0900 Yuya Nishihara templater: factor out function that creates templater from string template
Sun, 03 Apr 2016 23:26:48 +0900 Yuya Nishihara templater: separate function to create templater from map file (API)
Thu, 17 Mar 2016 00:36:01 +0000 timeless filemerge: use revset notation for p1/p2 of local/other descriptions
Thu, 17 Mar 2016 00:36:01 +0000 timeless filemerge: indicate that local/other are p1/p2
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal origpath: move from cmdutil to scmutil
Wed, 23 Dec 2015 12:51:45 -0800 Siddharth Agarwal filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Tue, 01 Dec 2015 09:48:38 -0800 Siddharth Agarwal filemerge: default regular prompts to 'leave unresolved' (BC)
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts
Mon, 30 Nov 2015 11:17:18 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to regular prompts
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Tue, 24 Nov 2015 10:58:35 -0800 Siddharth Agarwal filemerge: in ':prompt', use ':fail' tool rather than returning directly
Tue, 24 Nov 2015 10:57:01 -0800 Siddharth Agarwal filemerge: in ':fail' tool, write out other side if local side is deleted
Sat, 14 Nov 2015 00:00:46 -0800 Siddharth Agarwal filemerge: don't try to copy files known to be absent
Fri, 13 Nov 2015 23:57:43 -0800 Siddharth Agarwal filemerge: don't try using external tools on change/delete conflicts
Fri, 13 Nov 2015 23:56:00 -0800 Siddharth Agarwal filemerge: don't attempt to premerge change/delete conflicts
Fri, 13 Nov 2015 23:58:05 -0800 Siddharth Agarwal filemerge._mergecheck: add check for change/delete conflicts
Sun, 15 Nov 2015 21:40:15 -0800 Siddharth Agarwal filemerge._picktool: only pick from nomerge tools for change/delete conflicts
Fri, 13 Nov 2015 23:52:26 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':prompt' tool
less more | (0) -120 tip