Mercurial > hg

log mercurial/filemerge.py @ 43913:4b7d5d10c45d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -60 tip
age author description
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'
less more | (0) -100 -60 tip