log mercurial/filemerge.py @ 27015:341cb90ffd18

age author description
Mon, 16 Nov 2015 11:45:35 -0800 Siddharth Agarwal filemerge: introduce class whose objects represent files not in a context
Wed, 11 Nov 2015 10:19:11 -0800 Martin von Zweigbergk filemerge: remove leading space from " no tool found..."
Wed, 11 Nov 2015 17:34:28 -0800 Siddharth Agarwal filemerge: rename _symlinkcheck to _mergecheck
Tue, 10 Nov 2015 16:25:59 -0800 Christian Delahousse filemerge: choose where .orig files are kept
Tue, 10 Nov 2015 17:13:16 -0800 Siddharth Agarwal filemerge: treat EOF at prompt as fail, not abort
Sun, 08 Nov 2015 23:42:44 -0800 Siddharth Agarwal filemerge: move :merge-local/other symlink check to precheck
Mon, 02 Nov 2015 12:12:24 -0800 Siddharth Agarwal filemerge.prompt: separate out choice selection and action
Wed, 14 Oct 2015 12:57:33 -0400 Augie Fackler merge-tools: allow marking a mergetool as completely disabled
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sun, 11 Oct 2015 15:04:00 -0700 Siddharth Agarwal filemerge: clean up some dead code
Sun, 11 Oct 2015 20:47:14 -0700 Siddharth Agarwal filemerge: break overall filemerge into separate premerge and merge steps
Sun, 11 Oct 2015 20:04:40 -0700 Siddharth Agarwal filemerge: only copy to backup during premerge step
Sun, 11 Oct 2015 20:02:53 -0700 Siddharth Agarwal filemerge: only print out "merging f" output at premerge step
Thu, 08 Oct 2015 00:19:20 -0700 Siddharth Agarwal filemerge: deindent the parts of filemerge outside the try block
Sun, 11 Oct 2015 20:47:04 -0700 Siddharth Agarwal filemerge: introduce a premerge flag and function
Sun, 11 Oct 2015 12:56:21 -0700 Siddharth Agarwal filemerge: also return whether the merge is complete
Sun, 11 Oct 2015 12:31:08 -0700 Siddharth Agarwal filemerge: add a wrapper around the filemerge function
Wed, 07 Oct 2015 21:51:24 -0700 Siddharth Agarwal filemerge: clean up temp files in a finally block
Wed, 07 Oct 2015 23:35:30 -0700 Siddharth Agarwal filemerge: move post-merge checks into a separate function
Thu, 08 Oct 2015 14:18:43 -0700 Siddharth Agarwal filemerge._xmerge: drop no longer necessary 'if r:' check
Thu, 08 Oct 2015 14:17:31 -0700 Siddharth Agarwal filemerge._idump: drop no longer necessary 'if r:' check
Thu, 08 Oct 2015 14:16:19 -0700 Siddharth Agarwal filemerge._merge: drop no longer necessary 'if r:' check
Wed, 07 Oct 2015 21:22:16 -0700 Siddharth Agarwal filemerge: call premerge directly from main merge function
Wed, 07 Oct 2015 21:28:43 -0700 Siddharth Agarwal filemerge: move precheck to before files are written out
Wed, 07 Oct 2015 22:58:52 -0700 Siddharth Agarwal filemerge: move 'merging' output to before file creation
Wed, 07 Oct 2015 21:21:56 -0700 Siddharth Agarwal filemerge.filemerge: make a tuple containing merge paths on disk
Wed, 07 Oct 2015 16:14:57 -0700 Siddharth Agarwal filemerge: switch trymerge boolean to mergetype enum
Wed, 07 Oct 2015 15:13:41 -0700 Siddharth Agarwal filemerge: add some merge types
Wed, 07 Oct 2015 00:27:23 -0700 Siddharth Agarwal filemerge: run symlink check for :merge3
Wed, 07 Oct 2015 00:24:44 -0700 Siddharth Agarwal filemerge: print correct name of tool for symlink checks
Wed, 07 Oct 2015 00:01:16 -0700 Siddharth Agarwal filemerge: normalize 'internal:foo' names to ':foo'
Tue, 06 Oct 2015 22:57:21 -0700 Siddharth Agarwal filemerge: use symlinkcheck for :merge and :union
Tue, 06 Oct 2015 22:56:33 -0700 Siddharth Agarwal filemerge: add a precheck for symlinks
Tue, 06 Oct 2015 22:55:21 -0700 Siddharth Agarwal filemerge: call precheck if available
Tue, 06 Oct 2015 22:54:14 -0700 Siddharth Agarwal filemerge: add a before-merge callback to internal merge tools
Tue, 06 Oct 2015 17:39:13 -0700 Siddharth Agarwal filemerge: indent filemerge.filemerge
Thu, 10 Sep 2015 09:41:11 -0400 Jordi GutiƩrrez Hermoso filemerge: add non-interactive :merge-local and :merge-other
Sun, 16 Aug 2015 10:19:00 +0200 Erik Huelsmann filemerge: add 'union' merge to internal merge tool
Sun, 16 Aug 2015 00:24:29 +0200 Erik Huelsmann filemerge: split internal merge into api entry point and internal helper
Sat, 08 Aug 2015 19:15:09 -0700 Gregory Szorc filemerge: use absolute_import
Thu, 25 Jun 2015 17:46:55 -0500 Matt Mackall filemerge: mark internal-only config option
Mon, 04 May 2015 10:01:03 +0900 Yuya Nishihara templater: remove noop calls of parsestring(s, quoted=False) (API)
Thu, 19 Mar 2015 22:22:50 +0100 Mads Kiilerich merge: better debug messages before/after invoking external merge tool
Mon, 09 Feb 2015 23:07:39 -0800 Gregory Szorc help.merge-tools: do not double document merge tools
Sat, 08 Nov 2014 13:06:22 +0900 Yuya Nishihara util.system: use ui.system() in place of optional ui.fout parameter
Sun, 02 Nov 2014 14:58:50 -0500 Matt Harbison filemerge: split the logic for finding an external tool to its own function
Sun, 28 Sep 2014 17:15:28 +0200 Mads Kiilerich filemerge: switch the default name for internal tools from internal:x to :x
Sun, 28 Sep 2014 17:15:25 +0200 Mads Kiilerich filemerge: introduce :x as short version of internal:x merge tool name
Mon, 04 Aug 2014 16:32:41 -0700 Pierre-Yves David merge-tools: add a `premerge=keep-merge3` config option
Mon, 04 Aug 2014 16:58:39 -0700 Pierre-Yves David merge-tools: make premerge valid values extensible
Tue, 05 Aug 2014 14:58:45 -0700 Pierre-Yves David merge: add an internal:merge3 tool
Tue, 05 Aug 2014 15:09:54 -0700 Pierre-Yves David internal:merge: update documentation
Tue, 05 Aug 2014 15:17:38 -0700 Pierre-Yves David filemerge: allow the formatting of three labels instead of two
Tue, 05 Aug 2014 15:12:22 -0700 Pierre-Yves David filemerge: drop extra white space
Tue, 05 Aug 2014 14:56:25 -0700 Pierre-Yves David simplemerge: burn "minimal" feature to the ground
Tue, 29 Jul 2014 11:55:01 -0700 Pierre-Yves David merge: use no-minimal for premerge too
Mon, 09 Jun 2014 23:37:36 -0700 Pierre-Yves David merge: refactor labels selection code
Thu, 26 Jun 2014 01:20:25 +0200 Angel Ezquerra filemerge: add internal:tagmerge merge tool
Fri, 18 Jul 2014 21:49:52 -0500 Matt Mackall filemerge: use non-minimal conflict marker regions (BC)
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety