https://bz.mercurial-scm.org/show_bug.cgi?id=6630
Bug ID: 6630
Summary: Modified in hg log template inconsistent
Product: Mercurial
Version: 6.0.1
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: aklitz...@gmail.com
CC: mercurial-devel@mercurial-scm.org
Python Version: ---
We have an old history that were generated by old mercurial. If we generate
that log data we get inconsistent data.
If we see the whole log entry we can see that files "WorkflowTui*" are removed.
hg --debug log -r af8a20c94a51 -T json
[
{
"added": ["resources/images/icon_ok.png",
"resources/packaging/android/AndroidManifest.xml.in",
"src/card/bluetooth/base/messages/BluetoothMessageDisconnectResponse.cpp",
"src/card/bluetooth/base/messages/BluetoothMessageDisconnectResponse.h",
"src/card/bluetooth/base/messages/BluetoothMessageTransferApduResponse.cpp",
"src/card/bluetooth/base/messages/BluetoothMessageTransferApduResponse.h",
"src/core/model/AppSettings.cpp", "src/core/model/AppSettings.h",
"src/core/paos/PaosType.cpp", "src/tui/StepChooseCardTui.cpp",
"src/tui/StepChooseCardTui.h", "src/tui/StepErrorTui.cpp",
"src/tui/StepErrorTui.h", "src/tui/StepProcessingTui.cpp",
"src/tui/StepProcessingTui.h"],
"bookmarks": [],
"branch": "default",
"date": [1402037966, -7200],
"desc": "Merge",
"extra": {"branch": "default"},
"manifest": "00f81e809daf536b0b61c43df29d8157ad5107f2",
"modified": [".hgtags", "CMakeLists.txt", "cmake/Helper.cmake",
"cmake/Install.cmake", "cmake/Packaging.cmake", "resources/autentapp.qrc",
"resources/packaging/android/libAutentApp2.so-deployment-settings.json.in",
"src/card/base/Commands.cpp",
"src/card/bluetooth/base/BluetoothMessageCreator.cpp",
"src/card/bluetooth/base/BluetoothMessageCreator.h",
"src/card/bluetooth/base/messages/BluetoothMessageConnectResponse.cpp",
"src/card/bluetooth/ios/IosWaveConnection.h",
"src/card/bluetooth/ios/IosWaveConnection.mm",
"src/card/bluetooth/ios/IosWaveReaderManagerPlugIn.mm",
"src/card/bluetooth/ios/IosWaveSmartCardHandle.h",
"src/card/bluetooth/ios/IosWaveSmartCardHandle.mm",
"src/card/bluetooth/qt/BluetoothReader.cpp",
"src/card/bluetooth/qt/BluetoothReader.h",
"src/card/bluetooth/qt/BluetoothReaderManagerPlugIn.cpp",
"src/card/bluetooth/qt/BluetoothSmartCardHandle.cpp",
"src/card/bluetooth/qt/BluetoothSmartCardHandle.h",
"src/card/pcsc/PcscCard.cpp", "src/card/pcsc/PcscCard.h",
"src/card/pcsc/PcscCardImpl.cpp", "src/card/pcsc/PcscCardImpl.h",
"src/card/pcsc/PcscSmartCardHandle.cpp", "src/core/StateMachine.cpp",
"src/core/StateMachine.h", "src/core/TlsChannel12.cpp",
"src/core/controller/AppController.cpp", "src/core/controller/AppController.h",
"src/core/controller/AuthController.cpp",
"src/core/controller/ChangePinController.cpp",
"src/core/controller/SelfAuthController.cpp",
"src/core/controller/StepController.cpp",
"src/core/controller/StepController.h",
"src/core/controller/WorkflowController.cpp", "src/core/model/AppModel.cpp",
"src/core/model/AppModel.h", "src/core/model/StepModel.h",
"src/core/paos/PaosType.h", "src/core/step/StepChangePinReady.h",
"src/core/step/StepCheckRefreshAddress.cpp",
"src/core/step/StepCheckRefreshAddress.h", "src/core/step/StepChooseCard.cpp",
"src/core/step/StepChooseCard.h", "src/core/step/StepDidAuthenticateEac1.cpp",
"src/core/step/StepDidAuthenticateEac1.h",
"src/core/step/StepDidAuthenticateEac2.h", "src/core/step/StepError.cpp",
"src/core/step/StepError.h", "src/core/step/StepGenericSendReceive.cpp",
"src/core/step/StepGetTcToken.cpp", "src/core/step/StepProcessing.h",
"src/core/step/StepRedirectBrowser.cpp", "src/core/step/StepRedirectBrowser.h",
"src/core/step/StepSelfProcessing.cpp", "src/core/step/StepSelfProcessing.h",
"src/core/step/StepShowSelfAuthenticationData.h",
"src/core/step/StepTransmit.h", "src/core/view/StepDidAuthenticateEac1Ui.h",
"src/core/view/WorkflowUi.h", "src/gui/CMakeLists.txt",
"src/gui/GeneralSettingsWidget_desktop.cpp",
"src/gui/GeneralSettingsWidget_desktop.h", "src/gui/PinSettingsWidget.cpp",
"src/gui/PinSettingsWidget.ui", "src/gui/SettingsWidget_desktop.cpp",
"src/gui/SettingsWidget_ios.cpp",
"src/gui/step/StepAuthenticationEac1Gui_desktop.cpp",
"src/gui/step/StepAuthenticationEac1Gui_desktop.h",
"src/gui/step/StepAuthenticationEac1Gui_desktop.ui",
"src/gui/step/StepAuthenticationEac1Gui_ios.cpp",
"src/gui/step/StepAuthenticationEac1Gui_ios.h",
"src/gui/step/StepChooseCardGui.cpp", "src/gui/step/StepChooseCardGui.h",
"src/gui/step/StepGui.h", "src/gui/workflow/AuthQtWidget.cpp",
"src/gui/workflow/WorkflowAuthenticateQtGui.cpp",
"src/gui/workflow/WorkflowQtWidget_desktop.cpp",
"src/gui/workflow/WorkflowQtWidget_desktop.h",
"src/gui/workflow/WorkflowQtWidget_mobile.cpp",
"src/gui/workflow/WorkflowQtWidget_mobile.h",
"src/gui/workflow/WorkflowSelfInfoQtGui.cpp", "src/tui/AppTui.cpp",
"src/tui/AppTui.h", "src/tui/AuthTui.cpp", "src/tui/AuthTui.h",
"src/tui/StepAuthenticationEac1Tui.cpp",
"src/tui/StepAuthenticationEac1Tui.h"],
"node": "af8a20c94a51cd2d8a425e3769038bc84289493f",
"parents": ["9225203a030005ed8331f79f5a90806ec6ef5203",
"83b0758ef79f99c531c4dc69e2ecad52475b515a"],
"phase": "public",
"removed": ["resources/packaging/android/src/AndroidManifest.xml",
"src/gui/generic/ReaderSelectionView.cpp",
"src/gui/generic/ReaderSelectionView.h", "src/gui/generic/ReaderView.cpp",
"src/gui/generic/ReaderView.h", "src/tui/GenericStepTui.h",
"src/tui/StepTui.cpp", "src/tui/StepTui.h", "src/tui/WorkflowTui.cpp",
"src/tui/WorkflowTui.h"],
"rev": 2720,
"tags": [],
"user": "..."
}
]
But if we use "file_mods" it will be shown as modified and is not in
"file_dels".
hg --debug log -r af8a20c94a51 -T "{file_mods %
'{date|hgdate}|M|{file}\n'}{file_adds % '{date|hgdate}|A|{file}\n'}{file_dels %
'{date|hgdate}|D|{file}\n'}{file_copies %
'{date|hgdate}|{author|person}|A|{name}\n'}"
1402037966 -7200|M|resources/packaging/android/src/AndroidManifest.xml
1402037966 -7200|M|src/gui/generic/ReaderSelectionView.cpp
1402037966 -7200|M|src/gui/generic/ReaderSelectionView.h
1402037966 -7200|M|src/gui/generic/ReaderView.cpp
1402037966 -7200|M|src/gui/generic/ReaderView.h
1402037966 -7200|M|src/tui/GenericStepTui.h
1402037966 -7200|M|src/tui/StepTui.cpp
1402037966 -7200|M|src/tui/StepTui.h
1402037966 -7200|M|src/tui/WorkflowTui.cpp
1402037966 -7200|M|src/tui/WorkflowTui.h
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
