Mercurial > hg

log mercurial/filemerge.py @ 37548:8e7a4435ab6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
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
Wed, 18 Nov 2015 15:41:50 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':other' merge tool
Wed, 18 Nov 2015 15:40:28 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':local' merge tool
Wed, 18 Nov 2015 14:22:52 -0800 Siddharth Agarwal filemerge: return whether the file was deleted
Wed, 18 Nov 2015 13:55:31 -0800 Siddharth Agarwal filemerge: return whether the file is deleted from all other merge tools
Wed, 18 Nov 2015 13:52:28 -0800 Siddharth Agarwal filemerge: return whether the file is deleted for nomerge internal tools
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
less more | (0) -120 tip