mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/qt-ui
History
Linus Torvalds a29c4ddba3 git object store: make it possible to work with checked-out git branches 
This makes the git object save logic also check out the changes in the
working tree and index if the branch we save to is checked out.  It used
to be that we would just update the object store (and the branch ref, of
course), but leave any checked-out state untouched.

Note that if the working directory is dirty (ie you have made changes by
hand and not committed them), the checkout will skip any dirty files and
report it as a warning to the user.  However, the save still succeeds
(since the _real_ save goes to the backing store).

NOTE NOTE NOTE! Both loading and saving very fundamentally work on the
git object store level, and if you are working with a checked-out branch
and make modifications to the working tree, saving will not touch those
dirty files (so that you can try to recover your edits manually in the
working tree), but it's worth pointing out that subsufrace loading state
will totally ignore the working tree.

So the only way to make subsurface *see* your changes is to commit them.
Having edited state checked out in the working tree will only confuse
you when subsurface first ignores it on reading, and then refuses to
touch the checked-out state on writing.

Put another way: working with a checked-out branch is now _possible_,
but you need to be aware of the limitations.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-19 14:32:27 -07:00
..
css Fix TableWidget ( equipment ones ) on dark scheme. 2013-12-12 03:26:39 +01:00
marble Resync included header with upstream 2014-01-15 15:49:50 +07:00
profile Profile2: fix widths on some lines for Qt5 2014-03-19 09:37:12 -07:00
about.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
about.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
about.ui SubsurfaceAbout class cleanup. 2014-02-08 08:00:27 -08:00
completionmodels.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
completionmodels.h Put include guard to every header 2014-02-11 12:37:01 -08:00
divecomputermanagementdialog.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
divecomputermanagementdialog.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
divecomputermanagementdialog.ui Make some dialogs modal to MainWindow 2014-03-12 10:14:17 -07:00
divelistview.cpp Whitespace cleanup 2014-03-03 13:29:22 -08:00
divelistview.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
divelogimportdialog.cpp Convert other users of showError() to the new world order 2014-03-14 12:36:06 -07:00
divelogimportdialog.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
divelogimportdialog.ui Tune CVS import dialog 2014-02-27 11:44:59 -08:00
diveplanner.cpp Be more careful about dive computer selection 2014-03-17 10:53:49 -07:00
diveplanner.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
diveplanner.ui Add some limits to the GF's 2013-12-04 15:49:55 -08:00
downloadfromdivecomputer.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
downloadfromdivecomputer.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
downloadfromdivecomputer.ui Enable libdivecomputer log or dump from the UI 2013-12-24 16:26:00 -08:00
exif.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
exif.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
globe.cpp Remove pointless assignments 2014-03-03 21:40:56 -08:00
globe.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
graphicsview-common.cpp Fix colors on the new profile. 2014-03-07 20:37:17 -08:00
graphicsview-common.h Fix colors on the new profile. 2014-03-07 20:37:17 -08:00
groupedlineedit.cpp Whitespace cleanup 2014-03-03 13:29:22 -08:00
groupedlineedit.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
kmessagewidget.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
kmessagewidget.h Another small tweak to whitespace tool 2014-03-05 13:02:23 -08:00
maintab.cpp Saving edits requires to move focus first 2014-03-19 09:27:04 -07:00
maintab.h Show temperature units in the label when editing dive 2014-03-10 21:10:27 -07:00
maintab.ui Expand tags approach to divemaster field 2014-01-19 13:57:40 -08:00
mainwindow.cpp git object store: make it possible to work with checked-out git branches 2014-03-19 14:32:27 -07:00
mainwindow.h Add forward declaration of QSettings 2014-03-17 20:37:33 -07:00
mainwindow.ui Remove the old profile from the main screen of Subsurface 2014-03-07 08:54:20 -08:00
modeldelegates.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
modeldelegates.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
models.cpp Correctly check if tank is in use 2014-03-15 14:56:32 -07:00
models.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
preferences.cpp Support save / load for the Animation Speed on the Preferences 2014-03-11 17:41:41 -07:00
preferences.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
preferences.ui Support save / load for the Animation Speed on the Preferences 2014-03-11 17:41:41 -07:00
printdialog.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
printdialog.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
printlayout.cpp Fix compile problem 2014-03-07 10:03:03 -08:00
printlayout.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
printoptions.cpp Print: adjustments to PrintDialog 2013-11-30 18:56:25 +02:00
printoptions.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
printoptions.ui Remove more unused windowTitle properties 2013-11-29 11:02:15 -08:00
renumber.ui Make some dialogs modal to MainWindow 2014-03-12 10:14:17 -07:00
shiftimagetimes.ui Make some dialogs modal to MainWindow 2014-03-12 10:14:17 -07:00
shifttimes.ui Make some dialogs modal to MainWindow 2014-03-12 10:14:17 -07:00
simplewidgets.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
simplewidgets.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
starwidget.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
starwidget.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
subsurfacewebservices.cpp Convert other users of showError() to the new world order 2014-03-14 12:36:06 -07:00
subsurfacewebservices.h Convert other users of showError() to the new world order 2014-03-14 12:36:06 -07:00
tableview.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
tableview.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
tableview.ui Remove more unused windowTitle properties 2013-11-29 11:02:15 -08:00
tagwidget.cpp Make Up/Down arrows work with tags 2014-03-19 09:33:59 -07:00
tagwidget.h Make Up/Down arrows work with tags 2014-03-19 09:33:59 -07:00
usermanual.cpp Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
usermanual.h Massive automated whitespace cleanup 2014-02-27 20:09:57 -08:00
usermanual.ui Close search panel by button click 2014-02-10 07:12:35 -08:00
webservices.ui Improve the download from Subsurface webservice dialog 2014-01-15 15:33:04 +07:00