X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/bd69feaf7c3c94b6e7e216ea8091064af9cdfa97..cc9888a89b60ff6486ca17df2a9ffd703c6db5bb:/stgit/commands/common.py?ds=sidebyside

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 88c60ef..14dbf67 100644
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -89,7 +89,8 @@ def git_id(rev):
             patch = series.get_current()
             if not patch:
                 raise CmdException, 'No patches applied'
-        if patch in series.get_applied() or patch in series.get_unapplied():
+        if patch in series.get_applied() or patch in series.get_unapplied() or \
+               patch in series.get_hidden():
             if patch_id in ['top', '', None]:
                 return series.get_patch(patch).get_top()
             elif patch_id == 'bottom':
@@ -320,20 +321,11 @@ def address_or_alias(addr_str):
 
 def prepare_rebase(force=None):
     if not force:
-        # Be sure we won't loose results of stg-commit by error.
-        # Note: checking for refs/bases should not be necessary with
-        # repo format version 2, but better safe than sorry.
-        branchname = crt_series.get_name()
-        # references for anything but the current stack
-        refs = [ref for ref in git.all_refs()
-                if ref != 'refs/heads/'+branchname
-                and ref != 'refs/bases/'+branchname
-                and not re.match('^refs/patches/%s/'%branchname, ref)]
-        stray_commits = git._output_lines(['git-rev-list',
-                                           crt_series.get_base(),
-                                           '--not'] + refs)
-        if len(stray_commits) != 0:
-            raise CmdException, 'Rebasing would make the following commits below the stack base unreachable: %s' % stray_commits
+        # Be sure we won't loose results of stg-(un)commit by error.
+        # Do not require an existing orig-base for compatibility with 0.12 and earlier.
+        origbase = crt_series._get_field('orig-base')
+        if origbase and crt_series.get_base() != origbase:
+            raise CmdException, 'Rebasing would possibly lose data'
 
     # pop all patches
     applied = crt_series.get_applied()
@@ -352,6 +344,8 @@ def rebase(target):
     out.done()
 
 def post_rebase(applied, nopush, merged):
+    # memorize that we rebased to here
+    crt_series._set_field('orig-base', git.get_head())
     # push the patches back
     if not nopush:
         push_patches(applied, merged)