| Sat, 16 May 2020 20:38:19 +0200 |
Pierre-Yves David |
flags: actually merge flags in simplemerge
stable
|
file |
diff |
annotate
|
| Wed, 06 Nov 2019 15:42:30 -0500 |
Augie Fackler |
simplemerge: disable a pytype error where it's just confused
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
file |
diff |
annotate
|
| Wed, 20 Feb 2019 19:28:51 -0500 |
Augie Fackler |
cleanup: use () to wrap long lines instead of \
|
file |
diff |
annotate
|
| Wed, 01 Aug 2018 13:00:45 -0700 |
Gregory Szorc |
global: use pycompat.xrange()
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 21:56:20 +0900 |
Yuya Nishihara |
stringutil: bulk-replace call sites to point to new module
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 04:48:24 +0530 |
Pulkit Goyal |
py3: handle keyword arguments correctly in simplemerge.py
|
file |
diff |
annotate
|
| Fri, 01 Sep 2017 10:35:43 -0700 |
Phil Cohen |
simplemerge: remove unused `repo` parameter
|
file |
diff |
annotate
|
| Fri, 25 Aug 2017 13:49:17 -0700 |
Phil Cohen |
simplemerge: refactor _picklabels to be more compact
|
file |
diff |
annotate
|
| Fri, 25 Aug 2017 13:49:16 -0700 |
Phil Cohen |
simplemerge: remove check for null context
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: simplify code now that we always write to a context
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: make context parameters non-optional
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: stop accepting, and passing, file parameters
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:37 -0700 |
Phil Cohen |
simplemerge: stop reading from, and writing to, files
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:37 -0700 |
Phil Cohen |
simplemerge: use context paths for default labels instead of file paths
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:26:40 -0700 |
Phil Cohen |
simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 22:46:16 -0700 |
Phil Cohen |
filemerge: extract `_picklabels` as a helper function
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 22:46:03 -0700 |
Phil Cohen |
simplemerge: write merge result to the localctx, if passed
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
simplemerge: use contexts to read file data from, if passed
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
simplemerge: add optional context parameters to simplemerge
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
simplemerge: extract verifytext as a helper function
|
file |
diff |
annotate
|
| Thu, 22 Jun 2017 03:16:16 +0530 |
Pulkit Goyal |
py3: convert kwargs' keys' to str using pycompat.strkwargs()
|
file |
diff |
annotate
|
| Thu, 02 Mar 2017 13:30:58 +0100 |
Pierre-Yves David |
vfs: use 'vfs' module directly in 'mercurial.simplemerge'
|
file |
diff |
annotate
|
| Thu, 02 Mar 2017 03:52:36 +0100 |
Pierre-Yves David |
vfs: replace 'scmutil.opener' usage with 'scmutil.vfs'
|
file |
diff |
annotate
|
| Mon, 17 Oct 2016 23:16:55 +0200 |
Mads Kiilerich |
spelling: fixes of non-dictionary words
|
file |
diff |
annotate
|
| Thu, 20 Oct 2016 22:09:50 +0900 |
Yuya Nishihara |
simplemerge: obtain stdout from ui
|
file |
diff |
annotate
|
| Wed, 10 Feb 2016 09:06:08 -0800 |
Ryan McElroy |
merge: minimize conflicts when common base is not shown (issue4447)
|
file |
diff |
annotate
|
| Wed, 10 Feb 2016 08:25:03 -0800 |
Ryan McElroy |
merge: introduce method to minimize merge regions
|
file |
diff |
annotate
|
| Tue, 09 Feb 2016 15:25:09 -0800 |
Ryan McElroy |
merge: add some useful documentation
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
file |
diff |
annotate
|
| Wed, 12 Aug 2015 08:53:01 -0400 |
Jordi Gutiérrez Hermoso |
simplemerge: enable option to resolve conflicts one way
|
file |
diff |
annotate
|
| Sun, 16 Aug 2015 00:00:34 +0200 |
Erik Huelsmann |
simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers
|
file |
diff |
annotate
|
| Sat, 08 Aug 2015 19:54:11 -0700 |
Gregory Szorc |
simplemerge: use absolute_import
|
file |
diff |
annotate
|
| Thu, 07 Aug 2014 12:51:45 -0400 |
Jordi Gutiérrez Hermoso |
simplemerge: remove dead code
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 15:10:50 -0700 |
Pierre-Yves David |
simplemerge: support three labels when merging
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 14:56:25 -0700 |
Pierre-Yves David |
simplemerge: burn "minimal" feature to the ground
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:33:06 -0700 |
Durham Goode |
merge: prevent simplemerge from mutating label list
|
file |
diff |
annotate
|
| Sat, 12 May 2012 16:00:58 +0200 |
Brodie Rao |
cleanup: "raise SomeException()" -> "raise SomeException"
|
file |
diff |
annotate
|
| Sat, 12 May 2012 15:54:54 +0200 |
Brodie Rao |
cleanup: eradicate long lines
|
file |
diff |
annotate
|
| Fri, 06 Jan 2012 16:27:13 +0100 |
Martin Geisler |
Remove FSF mailing address from GPL headers
|
file |
diff |
annotate
|
| Sat, 29 Oct 2011 11:02:23 -0500 |
Matt Mackall |
backout dbdb777502dc (issue3077) (issue3071)
stable
|
file |
diff |
annotate
|
| Mon, 24 Oct 2011 13:51:24 +0200 |
Thomas Arendsen Hein |
consistency: use util.realpath instead of os.path.realpath where useful
stable
|
file |
diff |
annotate
|
| Thu, 25 Aug 2011 20:21:04 -0400 |
Greg Ward |
atomictempfile: make close() consistent with other file-like objects.
|
file |
diff |
annotate
|
| Tue, 07 Jun 2011 17:02:54 -0500 |
Matt Mackall |
check-code: catch misspellings of descendant
|
file |
diff |
annotate
|
| Sun, 15 May 2011 13:15:41 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 13 May 2011 19:46:36 -0500 |
Steve Borho |
simplemerge: do not allow binary files to abort an entire merge
stable
|
file |
diff |
annotate
|
| Wed, 20 Apr 2011 19:54:57 +0200 |
Adrian Buehlmann |
move opener from util to scmutil
|
file |
diff |
annotate
|
| Fri, 24 Sep 2010 12:46:54 -0500 |
Matt Mackall |
backout most of 4f8067c94729
|
file |
diff |
annotate
|
| Thu, 23 Sep 2010 00:02:31 -0500 |
Brodie Rao |
cleanup: use x in (a, b) instead of x == a or x == b
|
file |
diff |
annotate
|
| Thu, 26 Aug 2010 22:51:48 +0200 |
Mads Kiilerich |
simplemerge: remove hash-bang from non-executable script
stable
|
file |
diff |
annotate
|
| Mon, 25 Jan 2010 00:05:27 -0600 |
Matt Mackall |
many, many trivial check-code fixups
|
file |
diff |
annotate
|
| Tue, 28 Apr 2009 17:40:46 +0200 |
Simon Heimberg |
separate import lines from mercurial and general python modules
|
file |
diff |
annotate
|
| Thu, 30 Apr 2009 23:57:36 -0500 |
Steve Borho |
simplemerge: use ui.warn() for warnings
|
file |
diff |
annotate
|
| Tue, 28 Oct 2008 19:25:26 +0100 |
Benoit Boissinot |
remove unused variables
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:41 +0100 |
Joel Rosdahl |
Remove unused imports
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: move the bulk of simplemerge into core
|
file |
diff |
annotate
| base
|