Commits · 8295b503be90c60a8a7e9b722357352917406078 · Marco Bubke / flatpak-qt-creator

Oct 09, 2014

Eike Ziller authored 10 years ago


Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

8295b503

Aug 14, 2014

Show the chunk context info in unified diff · 45dc2e2a

jkobus authored 10 years ago


Task-number: QTCREATORBUG-12394
Change-Id: I827fb894fd373b34cbae19f686b15acb697489c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

45dc2e2a

Aug 11, 2014

DiffEditor: Fix no newline handling · d03927f3

Orgad Shaneh authored 10 years ago


Change-Id: I3278ae80d7ee010942122723b3e8bb8c729e7182
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

d03927f3

Aug 04, 2014

Fix reading of git format-patch output · d6e0df1c

jkobus authored 10 years ago


Task-number: QTCREATORBUG-12627
Change-Id: I7df1fe27f6502895ab9c82178084d2b631468c5d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

d6e0df1c

Jul 28, 2014

DiffEditor: Fix newline handling for not the last chunk · 4c7f1c5e

Jarek Kobus authored 10 years ago


Task-number: QTCREATORBUG-12665
Change-Id: I7a54fa5502d3e06c6e1ccd99dec800f80e217333
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

4c7f1c5e

Jul 09, 2014

Fix newline handling in diff editor · c9c4f05f

jkobus authored 10 years ago


Task-number: QTCREATORBUG-12618
Change-Id: If2a30ff4efdc106f43e2ea77d2783ea797e92722
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

c9c4f05f

Jul 07, 2014

Handle similarity index in git commits · e4ff24ea

jkobus authored 10 years ago


Task-number: QTCREATORBUG-12619
Change-Id: I5af39f18bc02ce1f06bf72f155bf0aaabe8b228d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

e4ff24ea

Jul 04, 2014

Make it possible to save diff editor contents · 656c3343

jkobus authored 10 years ago


Task-number: QTCREATORBUG-12548
Task-number: QTCREATORBUG-12549
Change-Id: Ia27080cc689da48fc5401010e2277edaf0a01f4d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

656c3343

Jun 17, 2014

Fix test for DiffEditor · 13dad5af

jkobus authored 10 years ago


Change-Id: I7359fade254b281ebf6422faf7f229bb1b82d8a8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

13dad5af

Jun 16, 2014

DiffEditor: Support patch with empty new/deleted file · b8df1a9b

Orgad Shaneh authored 11 years ago


Change-Id: Ic0341239309be3eae1ab2faf296bc6a698acebb0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

b8df1a9b

Jun 11, 2014

DiffEditor: Support patch with new/deleted file · 5e883e5b

Orgad Shaneh authored 11 years ago


Change-Id: I669564355e27dc06464fc8d8641b2f4255c8965e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

5e883e5b

DiffEditor: Cleanup regexps · fb48205e

Orgad Shaneh authored 11 years ago


* Remove escape where not needed ('-', ',')
* Remove brackets for single symbols (\d, \w)

Change-Id: I2595bfc775f93aeddc367d8889cd78fb5a3fac83
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

fb48205e

Jun 06, 2014

Implement unified diff editor · 8cad9453

jkobus authored 11 years ago


Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

8cad9453

Mar 12, 2014

Diff Editor: Fix compilation with Qt < 5.2. · 35eb3b15

Friedemann Kleint authored 11 years ago


Change-Id: I95401ed010e41341eb25bba032b924765b2c1be5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

35eb3b15

Mar 11, 2014

DiffEditor: refactor internal structures. · 9c2cdc89

jkobus authored 11 years ago


Simplify the implementation a lot.

Change-Id: I3f5daa3d2ce14c28d48c2e1e996ec4935d1dae3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

9c2cdc89

Mar 10, 2014

Move more function into diffutils, fix calculateOriginalData. · b846840c

jkobus authored 11 years ago


Change-Id: Id7bbdbf7778d21cb9aa15148876db95e9228fab3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

b846840c

Feb 28, 2014

Move internal structures and some functions into diffutils.h · a746f6fb

jkobus authored 11 years ago


Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

a746f6fb