Add --branch option to 'patches'

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/patches.py b/stgit/commands/patches.py
index 7da74ba846997acfe46cf1962304e3bdda61ee98..0b3c46f31450a44d382b9e1c705ec53e7d587c9f 100644 (file)
--- a/stgit/commands/patches.py
+++ b/stgit/commands/patches.py
@@ -32,7 +32,9 @@ option also lists the patch log and the diff for the given files."""
 
 options = [make_option('-d', '--diff',
                        help = 'show the diff for the given files',
 
 options = [make_option('-d', '--diff',
                        help = 'show the diff for the given files',

-                       action = 'store_true')]
+                       action = 'store_true'),
+           make_option('-b', '--branch',
+                       help = 'use BRANCH instead of the default one')]

 
 diff_tmpl = \
           '-------------------------------------------------------------------------------\n' \
 
 diff_tmpl = \
           '-------------------------------------------------------------------------------\n' \


@@ -52,7 +54,8 @@ def func(parser, options, args):
     if not applied:
         raise CmdException, 'No patches applied'
 
     if not applied:
         raise CmdException, 'No patches applied'
 

-    revs = git.modifying_revs(args, git_id('base'))
+    revs = git.modifying_revs(args, crt_series.get_base(),
+                              crt_series.get_head())

     revs.reverse()
 
     # build the patch/revision mapping
     revs.reverse()
 
     # build the patch/revision mapping

diff --git a/stgit/git.py b/stgit/git.py
index 458eb97a16cea0d4dcd4e49e84b5649f46c3f719..f9094cdaac670666fce3e14283e8e48a1405b9a8 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -891,10 +891,10 @@ def clone(repository, local_dir):
         raise GitException, 'Failed "git-clone %s %s"' \
               % (repository, local_dir)
 
         raise GitException, 'Failed "git-clone %s %s"' \
               % (repository, local_dir)
 

-def modifying_revs(files, base_rev):
+def modifying_revs(files, base_rev, head_rev):

     """Return the revisions from the list modifying the given files
     """
     """Return the revisions from the list modifying the given files
     """

-    cmd = ['git-rev-list', '%s..' % base_rev, '--']
+    cmd = ['git-rev-list', '%s..%s' % (base_rev, head_rev), '--']

     revs = [line.strip() for line in _output_lines(cmd + files)]
 
     return revs
     revs = [line.strip() for line in _output_lines(cmd + files)]
 
     return revs

diff --git a/stgit/stack.py b/stgit/stack.py
index 0f5d868d07e0b5b0d78901a52428d300644a4e1a..99f10e540df57463e88f455cec66ac1f76393da4 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -397,6 +397,15 @@ class Series(StgitObject):
     def get_base(self):
         return read_string(self.get_base_file())
 
     def get_base(self):
         return read_string(self.get_base_file())
 

+    def get_head(self):
+        """Return the head of the branch
+        """
+        crt = self.get_current_patch()
+        if crt:
+            return crt.get_top()
+        else:
+            return self.get_base()
+

     def get_protected(self):
         return os.path.isfile(os.path.join(self._dir(), 'protected'))
 
     def get_protected(self):
         return os.path.isfile(os.path.join(self._dir(), 'protected'))