Mercurial > hg

log mercurial/simplemerge.py @ 50896:b2b8c25f9462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Thu, 26 Jan 2023 00:23:07 +0100 Cédric Krier filemerge: add union-other-first as internal merge tool
Sun, 29 May 2022 15:17:27 +0200 Manuel Jacob py3: replace `pycompat.xrange` by `range`
Tue, 18 Jan 2022 13:05:21 -0800 Martin von Zweigbergk filemerge: add support for partial conflict resolution by external tool
Mon, 21 Feb 2022 13:08:28 -0700 Gregory Szorc py3: use class X: instead of class X(object):
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements
Mon, 07 Feb 2022 14:07:04 -0800 Martin von Zweigbergk simplemerge: remove now-unused arguments
Fri, 14 Jan 2022 08:17:13 -0800 Martin von Zweigbergk simplemerge: move printing of merge result to extension
Thu, 10 Feb 2022 15:48:01 -0800 Martin von Zweigbergk simplemerge: remove code for checking binary input now that callers do it
Thu, 10 Feb 2022 11:00:32 -0800 Martin von Zweigbergk simplemerge: store input data in MergeInput
Fri, 04 Feb 2022 18:36:36 -0800 Martin von Zweigbergk simplemerge: convert MergeInput to regular, non-attr.ib class
Thu, 10 Feb 2022 09:59:07 -0800 Martin von Zweigbergk simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
Thu, 20 Jan 2022 11:06:52 -0800 Martin von Zweigbergk simplemerge: take over formatting of label from `filemerge`
Thu, 20 Jan 2022 11:00:30 -0800 Martin von Zweigbergk simplemerge: take arguments as annotated context objects
Fri, 14 Jan 2022 09:28:44 -0800 Martin von Zweigbergk merge: consider the file merged when using :merge-{local,other}
Fri, 14 Jan 2022 08:44:36 -0800 Martin von Zweigbergk simplemerge: delete unused exception class `CantReprocessAndShowBase`
Tue, 11 Jan 2022 22:13:56 -0800 Martin von Zweigbergk simplemerge: change _minimize() to minimize a single conflict
Tue, 11 Jan 2022 22:03:55 -0800 Martin von Zweigbergk simplemerge: make minimize() a free function
Tue, 11 Jan 2022 21:56:27 -0800 Martin von Zweigbergk simplemerge: simplify and rename `render_markers()`
Tue, 11 Jan 2022 16:23:10 -0800 Martin von Zweigbergk simplemerge: split out function for rendering :merge3 conflict markers
Fri, 07 Jan 2022 23:29:19 -0800 Martin von Zweigbergk simplemerge: move default labels to simplemerge extension
Fri, 07 Jan 2022 22:23:44 -0800 Martin von Zweigbergk simplemerge: use same newline detection for :mergediff as for :merge[3]
Tue, 11 Jan 2022 16:54:42 -0800 Martin von Zweigbergk simplemerge: clarify names of functions that render conflict markers
Fri, 07 Jan 2022 22:16:22 -0800 Martin von Zweigbergk simplemerge: make merge_lines() a free function
Fri, 07 Jan 2022 18:42:31 -0800 Martin von Zweigbergk simplemerge: convert `merge_lines()` away from generator
Tue, 14 Dec 2021 13:12:56 -0800 Martin von Zweigbergk simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
Wed, 05 Jan 2022 11:34:54 -0800 Martin von Zweigbergk simplemerge: rewrite `merge_lines()` using `merge_groups()`
Thu, 06 Jan 2022 09:03:17 -0800 Martin von Zweigbergk simplemerge: make merge_groups() yield only 2-tuples
Tue, 07 Dec 2021 23:01:20 -0800 Martin von Zweigbergk simplemerge: don't calculate conflict labels when resolving automatically
Tue, 07 Dec 2021 22:45:31 -0800 Martin von Zweigbergk simplemerge: remove now-unused `localorother` argument from `merge_lines()`
Tue, 07 Dec 2021 22:33:18 -0800 Martin von Zweigbergk simplemerge: add a specialized function for "union", "local", "other"
Tue, 07 Dec 2021 17:48:50 -0800 Martin von Zweigbergk simplemerge: make `localorother` a "mode" instead of a separate thing
Tue, 07 Dec 2021 14:11:58 -0800 Martin von Zweigbergk simplemerge: avoid a call to `pycompat.strkwargs()`
Mon, 06 Dec 2021 23:17:43 -0800 Martin von Zweigbergk simplemerge: stop merging file flags
Mon, 29 Nov 2021 23:00:29 -0800 Martin von Zweigbergk simplemerge: set `conflicts` earlier for :union tool
Tue, 30 Mar 2021 02:32:30 +0200 Joerg Sonnenberger refactor: prefer checks against nullrev over nullid
Mon, 18 Jan 2021 22:32:09 -0800 Martin von Zweigbergk simplemerge: delete unused find_unconflicted()
Tue, 01 Dec 2020 21:54:46 +0100 Joerg Sonnenberger node: import symbols explicitly
Tue, 08 Dec 2020 16:45:13 -0800 Martin von Zweigbergk mergetools: add new conflict marker format with diffs in
Wed, 09 Dec 2020 00:00:19 -0800 Martin von Zweigbergk simplemerge: write output only once it's complete
Tue, 08 Dec 2020 23:05:53 -0800 Martin von Zweigbergk simplemerge: avoid quadratic concatenation when building output text
Tue, 08 Dec 2020 22:59:17 -0800 Martin von Zweigbergk simplemerge: work with opts as native strings instead of bytes
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
Tue, 02 Jun 2020 21:44:57 +0900 Yuya Nishihara simplemerge: rewrite flag merging loop as expression
Tue, 02 Jun 2020 21:40:49 +0900 Yuya Nishihara simplemerge: leverage pycompat function to convert byte string to set
Tue, 02 Jun 2020 21:39:07 +0900 Yuya Nishihara simplemerge: fix function name that tests if ctx is not null revision
Sat, 16 May 2020 20:38:19 +0200 Pierre-Yves David flags: actually merge flags in simplemerge stable
Wed, 06 Nov 2019 15:42:30 -0500 Augie Fackler simplemerge: disable a pytype error where it's just confused
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
Wed, 20 Feb 2019 19:28:51 -0500 Augie Fackler cleanup: use () to wrap long lines instead of \
Wed, 01 Aug 2018 13:00:45 -0700 Gregory Szorc global: use pycompat.xrange()
Thu, 22 Mar 2018 21:56:20 +0900 Yuya Nishihara stringutil: bulk-replace call sites to point to new module
Sun, 10 Dec 2017 04:48:24 +0530 Pulkit Goyal py3: handle keyword arguments correctly in simplemerge.py
Fri, 01 Sep 2017 10:35:43 -0700 Phil Cohen simplemerge: remove unused `repo` parameter
Fri, 25 Aug 2017 13:49:17 -0700 Phil Cohen simplemerge: refactor _picklabels to be more compact
Fri, 25 Aug 2017 13:49:16 -0700 Phil Cohen simplemerge: remove check for null context
Thu, 24 Aug 2017 21:30:51 -0700 Phil Cohen simplemerge: simplify code now that we always write to a context
Thu, 24 Aug 2017 21:30:51 -0700 Phil Cohen simplemerge: make context parameters non-optional
Thu, 24 Aug 2017 21:30:51 -0700 Phil Cohen simplemerge: stop accepting, and passing, file parameters
Thu, 24 Aug 2017 21:30:37 -0700 Phil Cohen simplemerge: stop reading from, and writing to, files
Thu, 24 Aug 2017 21:30:37 -0700 Phil Cohen simplemerge: use context paths for default labels instead of file paths
Thu, 24 Aug 2017 21:26:40 -0700 Phil Cohen simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`
Sun, 13 Aug 2017 22:46:16 -0700 Phil Cohen filemerge: extract `_picklabels` as a helper function
Sun, 13 Aug 2017 22:46:03 -0700 Phil Cohen simplemerge: write merge result to the localctx, if passed
Sun, 13 Aug 2017 20:06:52 -0700 Phil Cohen simplemerge: use contexts to read file data from, if passed
Sun, 13 Aug 2017 20:06:52 -0700 Phil Cohen simplemerge: add optional context parameters to simplemerge
Sun, 13 Aug 2017 20:06:52 -0700 Phil Cohen simplemerge: extract verifytext as a helper function
Thu, 22 Jun 2017 03:16:16 +0530 Pulkit Goyal py3: convert kwargs' keys' to str using pycompat.strkwargs()
Thu, 02 Mar 2017 13:30:58 +0100 Pierre-Yves David vfs: use 'vfs' module directly in 'mercurial.simplemerge'
Thu, 02 Mar 2017 03:52:36 +0100 Pierre-Yves David vfs: replace 'scmutil.opener' usage with 'scmutil.vfs'
Mon, 17 Oct 2016 23:16:55 +0200 Mads Kiilerich spelling: fixes of non-dictionary words
Thu, 20 Oct 2016 22:09:50 +0900 Yuya Nishihara simplemerge: obtain stdout from ui
Wed, 10 Feb 2016 09:06:08 -0800 Ryan McElroy merge: minimize conflicts when common base is not shown (issue4447)
Wed, 10 Feb 2016 08:25:03 -0800 Ryan McElroy merge: introduce method to minimize merge regions
Tue, 09 Feb 2016 15:25:09 -0800 Ryan McElroy merge: add some useful documentation
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Wed, 12 Aug 2015 08:53:01 -0400 Jordi Gutiérrez Hermoso simplemerge: enable option to resolve conflicts one way
Sun, 16 Aug 2015 00:00:34 +0200 Erik Huelsmann simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers
Sat, 08 Aug 2015 19:54:11 -0700 Gregory Szorc simplemerge: use absolute_import
Thu, 07 Aug 2014 12:51:45 -0400 Jordi Gutiérrez Hermoso simplemerge: remove dead code
Tue, 05 Aug 2014 15:10:50 -0700 Pierre-Yves David simplemerge: support three labels when merging
Tue, 05 Aug 2014 14:56:25 -0700 Pierre-Yves David simplemerge: burn "minimal" feature to the ground
Thu, 08 May 2014 16:33:06 -0700 Durham Goode merge: prevent simplemerge from mutating label list
Sat, 12 May 2012 16:00:58 +0200 Brodie Rao cleanup: "raise SomeException()" -> "raise SomeException"
Sat, 12 May 2012 15:54:54 +0200 Brodie Rao cleanup: eradicate long lines
Fri, 06 Jan 2012 16:27:13 +0100 Martin Geisler Remove FSF mailing address from GPL headers
Sat, 29 Oct 2011 11:02:23 -0500 Matt Mackall backout dbdb777502dc (issue3077) (issue3071) stable
Mon, 24 Oct 2011 13:51:24 +0200 Thomas Arendsen Hein consistency: use util.realpath instead of os.path.realpath where useful stable
Thu, 25 Aug 2011 20:21:04 -0400 Greg Ward atomictempfile: make close() consistent with other file-like objects.
Tue, 07 Jun 2011 17:02:54 -0500 Matt Mackall check-code: catch misspellings of descendant
Sun, 15 May 2011 13:15:41 -0500 Matt Mackall merge with stable
Fri, 13 May 2011 19:46:36 -0500 Steve Borho simplemerge: do not allow binary files to abort an entire merge stable
Wed, 20 Apr 2011 19:54:57 +0200 Adrian Buehlmann move opener from util to scmutil
Fri, 24 Sep 2010 12:46:54 -0500 Matt Mackall backout most of 4f8067c94729
Thu, 23 Sep 2010 00:02:31 -0500 Brodie Rao cleanup: use x in (a, b) instead of x == a or x == b
Thu, 26 Aug 2010 22:51:48 +0200 Mads Kiilerich simplemerge: remove hash-bang from non-executable script stable
Mon, 25 Jan 2010 00:05:27 -0600 Matt Mackall many, many trivial check-code fixups
Tue, 28 Apr 2009 17:40:46 +0200 Simon Heimberg separate import lines from mercurial and general python modules
Thu, 30 Apr 2009 23:57:36 -0500 Steve Borho simplemerge: use ui.warn() for warnings
Tue, 28 Oct 2008 19:25:26 +0100 Benoit Boissinot remove unused variables
Thu, 06 Mar 2008 22:23:41 +0100 Joel Rosdahl Remove unused imports
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: move the bulk of simplemerge into core base contrib/simplemerge@d1dc0aa0c774
less more | (0) tip