Thread (29 messages) flat view 29 messages, 9 authors, 2016-06-15

Re: [PATCH 2/2] Add 'stg uncommit' command

From: Catalin Marinas <hidden>
Date: 2016-06-15 22:42:19

Karl Hasselström wrote:
Add an uncommit command, which is exactly the opposite of 'stg
commit'.
Applied with two minor modifications. See below:
quoted hunk ↗ jump to hunk
--- a/stgit/commands/commit.py
+++ b/stgit/commands/commit.py
@@ -28,8 +28,9 @@ usage = """%prog [options]
 Merge the applied patches into the base of the current stack and
 remove them from the series while advancing the base.
 
-Use this command only if you want to permanently store the applied
-patches and no longer manage them with StGIT."""
+Use this command if you want to permanently store the applied patches
+and no longer manage them with StGIT. If you should change your mind
+later, use 'stg uncommit'."""
I removed this change because, even if uncommit does the opposite of
commit does, the intended use is not to use commit/uncommit in pairs.
quoted hunk ↗ jump to hunk
diff --git a/stgit/commands/uncommit.py b/stgit/commands/uncommit.py
new file mode 100644
index 0000000..4ac0dfb
--- /dev/null
+++ b/stgit/commands/uncommit.py
@@ -0,0 +1,80 @@
+__copyright__ = """
+Copyright (C) 2006, Catalin Marinas <catalin.marinas@gmail.com>
I added your name on the copyright since this is a new file.

Thanks,

Catalin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help