mercurial/filemerge.py
5caae380ff90735b1a1841a4f26147bf0f01351b
created 2017-10-26 11:07 -0700
pushed 2017-11-01 22:25 +0000
Kostia Balytskyi Kostia Balytskyi - filemerge: pass a default value to _toolstr (issue5718) stable
cab34bda259e6a604e9d0575cabe568baab28e0f
created 2017-10-20 14:15 -0700
pushed 2017-11-01 22:25 +0000
Joe Blaylock Joe Blaylock - help: fix typo in hg merge documentation stable
18a3274ed675b78a680b0ca3ab4e22a2b6c66f70
created 2017-10-08 20:37 +0200
pushed 2017-10-18 21:03 +0000
Boris Feld Boris Feld - configitems: register the full 'merge-tools' config and sub-options
284fa44f7f39309f211457a7d130dbcb327ec80f
created 2017-10-06 06:48 -0700
pushed 2017-10-18 21:03 +0000
Ryan McElroy Ryan McElroy - merge: allow user to halt merge on merge-tool failures
ed91846c29cf5a2a054286e36e1c3d9be9b10593
created 2017-10-06 06:48 -0700
pushed 2017-10-18 21:03 +0000
Ryan McElroy Ryan McElroy - filemerge: introduce functions to halt merge flow
1af4561b6bfed74eb40387d6800d46401582fcaa
created 2017-10-15 20:36 -0700
pushed 2017-10-18 21:03 +0000
Phil Cohen Phil Cohen - filemerge: add a missing flushall()
123a68e6b4739348d8ca2be66e84c079d1b52e9b
created 2017-10-13 12:34 -0700
pushed 2017-10-18 21:03 +0000
Phil Cohen Phil Cohen - filemerge: store backups in the overlayworkingctx if using imm
f21eecc64ace88f2eeeaadabdd99e8829f45758f
created 2017-10-16 13:10 -0700
pushed 2017-10-18 21:03 +0000
Phil Cohen Phil Cohen - filemerge: use arbitraryfilectx for backups
1d804c22c67128dd1b625dd681925d50f1a6fc09
created 2017-10-02 04:48 +0530
pushed 2017-10-18 21:03 +0000
Pulkit Goyal Pulkit Goyal - py3: use '%d' for integers instead of '%s'
9c07cff039bc8f81f4c3b560315b11296e3d95b1
created 2017-09-11 13:03 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: flush if using deferred writes when running a merge tool
c0ce60459d845da52dce9ad8c0122e46fca4279d
created 2017-09-11 13:03 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - merge: pass wctx to premerge, filemerge
cd38b83bfb2308c25deb48ec5452e0417d52e471
created 2017-09-05 12:04 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: use fctx.write() in the internal:dump tool, instead of copy
6330df9d6393eeb4ec67c484122086b44cf54cc7
created 2017-09-01 10:35 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - simplemerge: remove unused `repo` parameter
fe04c018eaac15ea48f2611f3d07978ba1044126
created 2017-08-31 11:28 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: add _restorebackup
96123bdea43eaeaa292e60f1e3a1a7bcb092c9c7
created 2017-08-31 11:28 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: reduce creation of tempfiles until needed
7558917f291ea428f335d8bc662b1e653da66bb9
created 2017-08-31 11:28 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: add `_workingpath`
d37f1bb681691a789f67d5bd9672830792512122
created 2017-08-31 11:28 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: move a util copy call to filectx.write
67cfffbfb6a0b9c798c8d245091e15aa3025bfa5
created 2017-08-31 11:28 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: eliminate most uses of tempfiles
52bd006b4f49b839d67b57a0fb50f11132a7b796
created 2017-08-31 11:05 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - filemerge: extract _maketemp and _makebackup
fa6309c5761dbe55781df0e99c71eb30ec17ab85
created 2017-08-24 21:30 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: stop accepting, and passing, file parameters
db3e9f7c91aabb43a597b619fd48cd5e73d8ef9e
created 2017-08-13 20:06 -0700
pushed 2017-08-19 05:07 +0000
Phil Cohen Phil Cohen - filemerge: pass contexts to simplemerge
50c44dee741ab99401bf0b3446fe4ae88ccd0bb2
created 2017-08-06 01:13 +0900
pushed 2017-08-10 07:07 +0000
FUJIWARA Katsunori FUJIWARA Katsunori - filemerge: move decorator definition for internal merge tools to registrar
11025c4f1016de901fe98b98b35a67a28bcd7838
created 2017-06-30 03:44 +0200
pushed 2017-07-17 20:01 +0000
Boris Feld Boris Feld - configitems: register the 'ui.mergemarkertemplate' config
0407a51b9d8c3ade36b6495f44897c7a70e20975
created 2017-07-14 14:22 -0700
pushed 2017-07-15 23:45 +0000
Jun Wu Jun Wu - codemod: register core configitems using a script
851825214aa341f1cf47d894b4f4f3cf33888529
created 2017-06-26 22:52 -0700
pushed 2017-07-02 02:16 +0000
Phil Cohen Phil Cohen - filemerge: convert a couple of wvfs calls in internal mergetools to contexts
2ecce24dfcd3307b86b6c6096b30f5802545f2cd
created 2017-04-22 19:56 +0900
pushed 2017-06-17 19:09 +0000
Yuya Nishihara Yuya Nishihara - templater: add simple interface for unnamed template (API)
264b86cf209240cb2381b32d8279bb32af848a82
created 2017-06-02 16:57 +0530
pushed 2017-06-15 18:20 +0000
Pulkit Goyal Pulkit Goyal - py3: convert bool variables to bytes
6587427b2018f2b55b02cf0a37fdaa1f5226e38b
created 2017-05-19 03:47 -0700
pushed 2017-05-20 21:05 +0000
Stanislau Hlebik Stanislau Hlebik - filemerge: store error messages in module variables
7e35d31b41fdae4d8128506e2d3661ccebc8fb65
created 2017-05-13 03:31 +0900
pushed 2017-05-13 19:55 +0000
FUJIWARA Katsunori FUJIWARA Katsunori - filemerge: add internal merge tool to dump files forcibly
177742666abd221de927a6eb3958023bc9c80459
created 2017-05-13 03:28 +0900
pushed 2017-05-13 19:55 +0000
FUJIWARA Katsunori FUJIWARA Katsunori - filemerge: make warning message more i18n friendly
7d4ce4b567c5f5671936092b96dcb2fd1e778307
created 2017-05-13 03:28 +0900
pushed 2017-05-13 19:55 +0000
FUJIWARA Katsunori FUJIWARA Katsunori - filemerge: show warning about choice of :prompt only at an actual fallback
458f7294dfeecf960d38eda517685b4680c39787
created 2017-02-25 19:36 +0900
pushed 2017-04-18 18:27 +0000
Yuya Nishihara Yuya Nishihara - filemerge: optionally strip quotes from merge marker template (BC)
ac7aa96e4cd86a38ddbf1ac15345b3277108fc8f
created 2017-03-15 15:11 -0700
pushed 2017-03-18 17:32 +0000
Pierre-Yves David Pierre-Yves David - filemerge: explicitly tests for None
84e8a68342233039e56dcde08f066a86c940012b
created 2017-03-06 03:19 -0800
pushed 2017-03-09 22:10 +0000
Simon Farnsworth Simon Farnsworth - filemerge: tag merge tool for blocked times
48dea083f66d6cb7bbb778fa87e7374833399100
created 2017-02-13 20:06 +0530
pushed 2017-02-16 05:23 +0000
Pulkit Goyal Pulkit Goyal - py3: convert the mode argument of os.fdopen to unicodes (1 of 2)
4d019d0e1b3b1f635fc6b55a856c2cc3d64a1bde
created 2017-02-09 09:32 -0800
pushed 2017-02-16 05:23 +0000
Martin von Zweigbergk Martin von Zweigbergk - merge: print status message before launching external merge tool
f1c9fafcbf46a2a9d8c1e7333ab0f076b1c7cb1d
created 2016-12-18 01:54 +0530
pushed 2016-12-22 17:34 +0000
Pulkit Goyal Pulkit Goyal - py3: replace os.environ with encoding.environ (part 3 of 5)
c2154979409d5b9077b88c181f07da69a6f680dc
created 2016-11-23 23:47 +0100
pushed 2016-11-28 22:29 +0000
Mads Kiilerich Mads Kiilerich - merge: use original file extension for temporary files
8819b63732b9180247feaa90dd1e4b3129cf4180
created 2016-11-10 16:33 -0500
pushed 2016-11-15 02:50 +0000
Augie Fackler Augie Fackler - filemerge: avoid shadowing a variable in a list comprehension
aa23c93e636d1045b932588cdb742cce6fd62313
created 2016-10-08 16:10 +0200
pushed 2016-10-13 19:45 +0000
Pulkit Goyal Pulkit Goyal - py3: make format strings unicodes and not bytes
978b907d9b3646839b7e68d9d0d193dbc6c8fb66
created 2016-08-12 05:56 -0700
pushed 2016-08-14 20:02 +0000
Simon Farnsworth Simon Farnsworth - merge: always use other, not remote, in user prompts
a7f8939641aabf73ecdc0fdf68b944c2a14c9de3
created 2016-08-12 06:01 -0700
pushed 2016-08-14 20:02 +0000
Simon Farnsworth Simon Farnsworth - merge: use labels in prompts to the user
99b50346b750af631434a74611cd06c00d0f6d63
created 2015-05-05 10:51 +0900
pushed 2016-08-05 03:17 +0000
Yuya Nishihara Yuya Nishihara - merge: concatenate default conflict marker at parsing phase of .py
78759f78a44ed98637ae0c0ad4a26f95e0bcd4f1
created 2016-04-10 17:23 +0900
pushed 2016-04-26 22:20 +0000
Yuya Nishihara Yuya Nishihara - templater: factor out function that creates templater from string template
f97a0bcfd7a1a5a8a8aba97529650c8cbd1fb4a0
created 2016-04-03 23:26 +0900
pushed 2016-04-26 22:20 +0000
Yuya Nishihara Yuya Nishihara - templater: separate function to create templater from map file (API)
4fc640fd002623cf5c9e125c9db1e93437039eda
created 2016-03-17 00:36 +0000
pushed 2016-04-03 17:09 +0000
timeless timeless - filemerge: use revset notation for p1/p2 of local/other descriptions
66d085e55ecd84e96be6b210f081882c15df64e3
created 2016-03-17 00:36 +0000
pushed 2016-03-27 04:36 +0000
timeless timeless - filemerge: indicate that local/other are p1/p2
66bd14c189197635a1f532c00b1034952b6058f7
created 2014-08-31 09:40 +0200
pushed 2016-03-13 22:51 +0000
Gregory Szorc Gregory Szorc - filemerge: exclude some markup languages from conflict marker detection draft
733759a015c950cf12877bbced519b92d7066b02
created 2016-03-13 15:44 -0700
pushed 2016-03-13 22:51 +0000
Gregory Szorc Gregory Szorc - filemerge: extract conflict marker searching into its own function draft
07fc2f2134ba91581547fda77735559a64b187cd
created 2016-01-02 03:02 -0800
pushed 2016-01-08 01:01 +0000
Siddharth Agarwal Siddharth Agarwal - origpath: move from cmdutil to scmutil
88d5db4b155c261c803ff29fc3504bfdf79d23e9
created 2015-12-01 09:48 -0800
pushed 2015-12-04 02:10 +0000
Siddharth Agarwal Siddharth Agarwal - filemerge: default regular prompts to 'leave unresolved' (BC)
27b89a0957ec9c9ab7168a54a39343225a6960e9
created 2015-11-30 13:43 -0800
pushed 2015-12-04 02:10 +0000
Siddharth Agarwal Siddharth Agarwal - filemerge: add a 'leave unresolved' option to change/delete prompts
4ab69be0ea15572503fafbb1aa0ee106f13ef9a8
created 2015-11-30 11:17 -0800
pushed 2015-12-04 02:10 +0000
Siddharth Agarwal Siddharth Agarwal - filemerge: add a 'leave unresolved' option to regular prompts
296d55def9c45b9ac5f364b24b1a2d5ae8d84651
created 2015-11-25 14:25 -0800
pushed 2015-12-04 02:10 +0000
Siddharth Agarwal Siddharth Agarwal - filemerge: add debug output for whether this is a change/delete conflict
9c870e3efab701ad8c19c336731d3bca58c80e91
created 2015-11-24 10:58 -0800
pushed 2015-12-04 02:10 +0000
Siddharth Agarwal Siddharth Agarwal - filemerge: in ':prompt', use ':fail' tool rather than returning directly
less more (0) -100 -60 tip