Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

expectDirectoryChange is called by ConflictHandler. After the command
is executed it is too late

Change-Id: I27e82fd2a979a043932b4a838f3736cbe0f60107
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I8f79b8ad41acc8f8aa77d78037191513596de924
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: I0dda7f5ef471f3cb6379e4dda2900e4c8c0f87cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Actions on Commits, Fixup Last Commit, Interactive Rebase,
Rename branch, Push to remote repository, and Push to Gerrit

Change-Id: I434f836944d9fa86fad73f0256b330aad9532ed0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Change-Id: Iaf3202b70fdef2508259287f7c275a96aaf8f51d
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I9dbc3d3aa8eb39ade9e801b219aea575d44b33ab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Change-Id: I1e093d042033d87f0382560e00f71d24c7f55b03
Reviewed-by: hjk <hjk121@nokiamail.com>

Changed constant name from MECURIALREPO to MERCURIALREPO.

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

Change-Id: I8631ac0677205412306cb26a85b5b04e6f82fdd2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Id6fcdbdb0c776458eb16c7fc6765046969c2658e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Sort filenodes based on filenumbers if filenames are identical.

Fall back to comparing pointers only if the line numbers are also
the same.

Change-Id: I5e53f01c2b4684307895a57a2d1b27507e218af3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I1baa4684e85d0ccd677956eeff88b4cc7d807922
Reviewed-by: hjk <hjk121@nokiamail.com>

Fix a regression from 2.7: A new .qmlproject did also have C++ enabled
as a debugger language by default. Instead of reviving the old, hacky
logic from 2.7 that directly manipulated the aspect object,
the aspect now checks for the actual project language, along the logic
of the QML language check.

Change-Id: I77c9323fd59079c42874dadf4dc54b9991204d9d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

QString uses utf-16 internally. If we explicitly convert to utf-8
and then use the QByteArray implicit constructor of QString again,
Qt 4 will interpret the utf-8 encoded string as latin1.
This results in a wrong string for everything that is not pure ASCII.

With Qt 5 it works, since the assumed default encoding of QByteArray
is utf-8. Still any conversion does not make sense.

Task-number: QTCREATORBUG-9493
Change-Id: Ifbaa4684e85d0ccd677956eeff88b4cc7d807922
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Change-Id: If69b890484ea27c8c35c77936186d183b8b47b98
Reviewed-by: hjk <hjk121@nokiamail.com>

This dialog was before, in QtCreator 2.7, used only for show. It was in
main git menu, and available always. Although a lot of new options were
added to the dialog, I think it is good to get it back to where it was
before, so that 2.7 users can find it easier.

Also, I prefer this location for it, since it is easier to access here.

Change-Id: I510ab0efb081194e70f6297125012034103e13e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I17c16616a6d28dbf08f0de8dba57bb37568aab02
Reviewed-by: hjk <hjk121@nokiamail.com>

* git rev-parse --show-toplevel doesn't work inside git dir.
* Only "Describe (show)" should be available for those files. show
  works when running from inside the git dir

Change-Id: If5f3d1af8da2f8d149ac1e03ffd70b530e609557
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

* When mergetool is done
* Stash
* Stash pop
* Continue/skip command
* executeAndHandleConflicts
* Interactive rebase

Change-Id: Ic8108b096c367c7777dae06f7ff255999d64fda9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

These editors are usually opened when a process is in progress, so
it doesn't make sense to allow reverting or cherry-picking for them

Change-Id: I6f238ef973be86d07d2646bcea969f9aa2742b9d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ia6c929ae64008dcb37695a5358c44096a893e0c4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Less noise

Change-Id: I5c13af770f04ae411b09ed824cf93d2768b8e224
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

--remotes was added in 1.7.7

Change-Id: I691bfada8e0b4d2f00924caa76271ee256edf62c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I0b46e2403e67e29151c7b02e7371eaf4569f7168
Reviewed-by: David Schulz <david.schulz@digia.com>

Change-Id: I1926733dc88902e75921a6bfa184e3f6b27ce98d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I68b69fa00dd6cc189ecfcdb9dfad09c41531883f
Reviewed-by: David Schulz <david.schulz@digia.com>

Change-Id: If5f58467144a72d29fca7b320f55cd9c21f4457f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Schulz <david.schulz@digia.com>

* Delete process when finished
* Handle unpack failure
* Support lzop on Windows (if available)

Change-Id: I8d95b77922c8b22b5874dffd8f935ff184902e12
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Idf617c9ea7e13474abab6fc5dad4f8885dc7902b
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I3bab865726feedc6df54ad852d4aaf5f3bc1460d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Task-number: QTCREATORBUG-8904

Change-Id: Ic4129bff89afb6b3f6d210cbd738c3281c174884
Reviewed-by: hjk <hjk121@nokiamail.com>

This shouldn't be necessary, works around QTBUG-31569 (Qt5)

Change-Id: Iff157a76a896bc4d6224039ae859788818abba8b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I710817ffd7bdf87aa6c0fed0f1f3cd4ea842fd01
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

It's covered by tst_dumper nowadays.

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

Task-number: QTCREATORBUG-9494

Change-Id: Ica26e1448b1997e102648be58128f1be00c4905e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Change-Id: I16a61c1215d64243238a4cfbee007a78c282eb4c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Make it possible to pull and push onto online repositories with http
authorization.

Task-number: QTCREATORBUG-5104

Change-Id: Id5f5a865d301e644002e4fa8b7056d08fd9b7467
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I31e00cbf00e07749cf8e54732ec6cdbf623e44dd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>