| 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
|
