Ask vim to avoid backup copies of .stgit.msg

[stgit] / stgit / commands / common.py

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 4e4a79f..575aae7 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -68,6 +68,11 @@ def git_id(string):
             return series.get_patch(patch_name).get_top()
         elif patch_id == 'bottom':
             return series.get_patch(patch_name).get_bottom()
+        # Note we can return None here.
+        elif patch_id == 'top.old':
+            return series.get_patch(patch_name).get_old_top()
+        elif patch_id == 'bottom.old':
+            return series.get_patch(patch_name).get_old_bottom()
 
     # base
     if patch_name == 'base' and len(string_list) == 1:
@@ -92,25 +97,37 @@ def check_conflicts():
     if os.path.exists(os.path.join(git.base_dir, 'conflicts')):
         raise CmdException, 'Unsolved conflicts. Please resolve them first'
 
-def print_crt_patch():
-    patch = crt_series.get_current()
+def print_crt_patch(branch = None):
+    if not branch:
+        patch = crt_series.get_current()
+    else:
+        patch = stack.Series(branch).get_current()
+
     if patch:
         print 'Now at patch "%s"' % patch
     else:
         print 'No patches applied'
 
-def resolved(filename):
+def resolved(filename, reset = None):
+    if reset:
+        reset_file = filename + '.' + reset
+        if os.path.isfile(reset_file):
+            if os.path.isfile(filename):
+                os.remove(filename)
+            os.rename(reset_file, filename)
+
     git.update_cache([filename], force = True)
+
     for ext in ['.local', '.older', '.remote']:
         fn = filename + ext
         if os.path.isfile(fn):
             os.remove(fn)
 
-def resolved_all():
+def resolved_all(reset = None):
     conflicts = git.get_conflicts()
     if conflicts:
         for filename in conflicts:
-            resolved(filename)
+            resolved(filename, reset)
         os.remove(os.path.join(git.base_dir, 'conflicts'))
 
 def name_email(string):