From 1d99260cb9dfaed5fcac73659bb577d501e97489 Mon Sep 17 00:00:00 2001 From: Louis-Claude Canon Date: Wed, 25 Jul 2012 09:13:38 +0200 Subject: [PATCH] Enhancement - Stop consider new tasks after quitting a bulk change. --- ChangeLog | 3 +++ src/commands/CmdAnnotate.cpp | 2 ++ src/commands/CmdAppend.cpp | 2 ++ src/commands/CmdDelete.cpp | 2 ++ src/commands/CmdDenotate.cpp | 2 ++ src/commands/CmdDone.cpp | 2 ++ src/commands/CmdDuplicate.cpp | 2 ++ src/commands/CmdModify.cpp | 2 ++ src/commands/CmdPrepend.cpp | 2 ++ src/commands/CmdStart.cpp | 2 ++ src/commands/CmdStop.cpp | 2 ++ 11 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index d725f449f..2df7263d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ 2.2.0 () +Features + + Stop consider new tasks after quitting a bulk change. + Bugs + Fixed bug #1038, which prints blank lines with bulk changes and when the verbose attributes does not specify it. Lines do a better separation between diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp index 7069e18c3..91a82e735 100644 --- a/src/commands/CmdAnnotate.cpp +++ b/src/commands/CmdAnnotate.cpp @@ -119,6 +119,8 @@ int CmdAnnotate::execute (std::string& output) std::cout << STRING_CMD_ANNO_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } // Now list the project changes. diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp index 25d52ff31..4e9c8c670 100644 --- a/src/commands/CmdAppend.cpp +++ b/src/commands/CmdAppend.cpp @@ -119,6 +119,8 @@ int CmdAppend::execute (std::string& output) std::cout << STRING_CMD_APPEND_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } // Now list the project changes. diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp index 1804608a1..79405d1b7 100644 --- a/src/commands/CmdDelete.cpp +++ b/src/commands/CmdDelete.cpp @@ -143,6 +143,8 @@ int CmdDelete::execute (std::string& output) std::cout << STRING_CMD_DELETE_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } else { diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp index f6ebc2ebf..8e99acdbb 100644 --- a/src/commands/CmdDenotate.cpp +++ b/src/commands/CmdDenotate.cpp @@ -132,6 +132,8 @@ int CmdDenotate::execute (std::string& output) std::cout << STRING_CMD_DENO_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } else { diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp index f7fa4d9c2..965c3a3bf 100644 --- a/src/commands/CmdDone.cpp +++ b/src/commands/CmdDone.cpp @@ -111,6 +111,8 @@ int CmdDone::execute (std::string& output) std::cout << STRING_CMD_DONE_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } else { diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp index baba55060..7be9ddbb2 100644 --- a/src/commands/CmdDuplicate.cpp +++ b/src/commands/CmdDuplicate.cpp @@ -125,6 +125,8 @@ int CmdDuplicate::execute (std::string& output) std::cout << STRING_CMD_DUPLICATE_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } // Now list the project changes. diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp index 3fc87996e..32c03add5 100644 --- a/src/commands/CmdModify.cpp +++ b/src/commands/CmdModify.cpp @@ -162,6 +162,8 @@ int CmdModify::execute (std::string& output) std::cout << STRING_CMD_MODIFY_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } } diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp index 6fbafdd95..50eac72da 100644 --- a/src/commands/CmdPrepend.cpp +++ b/src/commands/CmdPrepend.cpp @@ -119,6 +119,8 @@ int CmdPrepend::execute (std::string& output) std::cout << STRING_CMD_PREPEND_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } // Now list the project changes. diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp index 6c73e22ca..5789b6342 100644 --- a/src/commands/CmdStart.cpp +++ b/src/commands/CmdStart.cpp @@ -104,6 +104,8 @@ int CmdStart::execute (std::string& output) std::cout << STRING_CMD_START_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } else { diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp index 16409e7e5..857309a0b 100644 --- a/src/commands/CmdStop.cpp +++ b/src/commands/CmdStop.cpp @@ -100,6 +100,8 @@ int CmdStop::execute (std::string& output) std::cout << STRING_CMD_STOP_NO << "\n"; rc = 1; } + if (_permission_quit) + break; } else {