Commits

Agustin Henze committed 8e5d35a

Added setuptools support, now it can be installed using python setup.py install or much better pip install hgshelve

Comments (0)

Files changed (10)

+^.*.swp
+build/*
+egg-info/*
+dist/*
+Version 0.1 - 2012-11-09
+ * Initial release
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+include LICENSE
+include COPYRIGHT
+include README
+include test-shelve
+include test-shelve-color
+include test-shelve-color.out
+include test-shelve.out
+The shelve extension provides the shelve command to let you choose which parts
+of the changes in a working directory you'd like to set aside temporarily, at
+the granularity of patch hunks. You can later restore the shelved patch hunks
+using the unshelve command.
+
+The shelve extension has been adapted from Mercurial's RecordExtension.
+
+See `hg shelve --help` for the complete list of commands.
+
+For more information please visit the `hgshelve website`_.
+
+.. _hgshelve website: https://bitbucket.org/tksoh/hgshelve

hgshelve.py

-# shelve.py
-#
-# Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
-# Copyright 2007 TK Soh <teekaysoh@gmailcom>
-#
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
-
-'''interactive change selection to set aside that may be restored later'''
-
-from mercurial.i18n import _
-from mercurial import cmdutil, commands, cmdutil, hg, mdiff, patch, revlog
-from mercurial import util, fancyopts, extensions
-import copy, cStringIO, errno, operator, os, re, shutil, tempfile
-
-lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)')
-
-def scanpatch(fp):
-    lr = patch.linereader(fp)
-
-    def scanwhile(first, p):
-        lines = [first]
-        while True:
-            line = lr.readline()
-            if not line:
-                break
-            if p(line):
-                lines.append(line)
-            else:
-                lr.push(line)
-                break
-        return lines
-
-    while True:
-        line = lr.readline()
-        if not line:
-            break
-        if line.startswith('diff --git a/'):
-            def notheader(line):
-                s = line.split(None, 1)
-                return not s or s[0] not in ('---', 'diff')
-            header = scanwhile(line, notheader)
-            fromfile = lr.readline()
-            if fromfile.startswith('---'):
-                tofile = lr.readline()
-                header += [fromfile, tofile]
-            else:
-                lr.push(fromfile)
-            yield 'file', header
-        elif line[0] == ' ':
-            yield 'context', scanwhile(line, lambda l: l[0] in ' \\')
-        elif line[0] in '-+':
-            yield 'hunk', scanwhile(line, lambda l: l[0] in '-+\\')
-        else:
-            m = lines_re.match(line)
-            if m:
-                yield 'range', m.groups()
-            else:
-                raise patch.PatchError('unknown patch content: %r' % line)
-
-class header(object):
-    diff_re = re.compile('diff --git a/(.*) b/(.*)$')
-    allhunks_re = re.compile('(?:index|new file|deleted file) ')
-    pretty_re = re.compile('(?:new file|deleted file) ')
-    special_re = re.compile('(?:index|new|deleted|copy|rename) ')
-
-    def __init__(self, header):
-        self.header = header
-        self.hunks = []
-
-    def binary(self):
-        for h in self.header:
-            if h.startswith('index '):
-                return True
-
-    def pretty(self, fp):
-        for h in self.header:
-            if h.startswith('index '):
-                fp.write(_('this modifies a binary file (all or nothing)\n'))
-                break
-            if self.pretty_re.match(h):
-                fp.write(h)
-                if self.binary():
-                    fp.write(_('this is a binary file\n'))
-                break
-            if h.startswith('---'):
-                fp.write(_('%d hunks, %d lines changed\n') %
-                         (len(self.hunks),
-                          sum([h.added + h.removed for h in self.hunks])))
-                break
-            fp.write(h)
-
-    def write(self, fp):
-        fp.write(''.join(self.header))
-
-    def allhunks(self):
-        for h in self.header:
-            if self.allhunks_re.match(h):
-                return True
-
-    def files(self):
-        fromfile, tofile = self.diff_re.match(self.header[0]).groups()
-        if fromfile == tofile:
-            return [fromfile]
-        return [fromfile, tofile]
-
-    def filename(self):
-        return self.files()[-1]
-
-    def __repr__(self):
-        return '<header %s>' % (' '.join(map(repr, self.files())))
-
-    def special(self):
-        for h in self.header:
-            if self.special_re.match(h):
-                return True
-
-def countchanges(hunk):
-    add = len([h for h in hunk if h[0] == '+'])
-    rem = len([h for h in hunk if h[0] == '-'])
-    return add, rem
-
-class hunk(object):
-    maxcontext = 3
-
-    def __init__(self, header, fromline, toline, proc, before, hunk, after):
-        def trimcontext(number, lines):
-            delta = len(lines) - self.maxcontext
-            if False and delta > 0:
-                return number + delta, lines[:self.maxcontext]
-            return number, lines
-
-        self.header = header
-        self.fromline, self.before = trimcontext(fromline, before)
-        self.toline, self.after = trimcontext(toline, after)
-        self.proc = proc
-        self.hunk = hunk
-        self.added, self.removed = countchanges(self.hunk)
-
-    def __cmp__(self, rhs):
-        # since the hunk().toline needs to be adjusted when hunks are
-        # removed/added, we can't take it into account when we cmp
-        attrs = ['header', 'fromline', 'proc', 'hunk', 'added', 'removed']
-        for attr in attrs:
-            selfattr = getattr(self, attr, None)
-            rhsattr = getattr(rhs, attr, None)
-
-            if selfattr is None or rhsattr is None:
-                raise util.Abort(_('non-existant attribute %s') % attr)
-
-            rv = cmp(selfattr, rhsattr)
-            if rv != 0:
-                return rv
-        return rv
-
-
-    def write(self, fp):
-        delta = len(self.before) + len(self.after)
-        if self.after and self.after[-1] == '\\ No newline at end of file\n':
-            delta -= 1
-        fromlen = delta + self.removed
-        tolen = delta + self.added
-        fp.write('@@ -%d,%d +%d,%d @@%s\n' %
-                 (self.fromline, fromlen, self.toline, tolen,
-                  self.proc and (' ' + self.proc)))
-        fp.write(''.join(self.before + self.hunk + self.after))
-
-    pretty = write
-
-    def filename(self):
-        return self.header.filename()
-
-    def __repr__(self):
-        return '<hunk %r@%d>' % (self.filename(), self.fromline)
-
-def parsepatch(fp):
-    class parser(object):
-        def __init__(self):
-            self.fromline = 0
-            self.toline = 0
-            self.proc = ''
-            self.header = None
-            self.context = []
-            self.before = []
-            self.hunk = []
-            self.stream = []
-
-        def addrange(self, (fromstart, fromend, tostart, toend, proc)):
-            self.fromline = int(fromstart)
-            self.toline = int(tostart)
-            self.proc = proc
-
-        def addcontext(self, context):
-            if self.hunk:
-                h = hunk(self.header, self.fromline, self.toline, self.proc,
-                         self.before, self.hunk, context)
-                self.header.hunks.append(h)
-                self.stream.append(h)
-                self.fromline += len(self.before) + h.removed
-                self.toline += len(self.before) + h.added
-                self.before = []
-                self.hunk = []
-                self.proc = ''
-            self.context = context
-
-        def addhunk(self, hunk):
-            if self.context:
-                self.before = self.context
-                self.context = []
-            self.hunk = hunk
-
-        def newfile(self, hdr):
-            self.addcontext([])
-            h = header(hdr)
-            self.stream.append(h)
-            self.header = h
-
-        def finished(self):
-            self.addcontext([])
-            return self.stream
-
-        transitions = {
-            'file': {'context': addcontext,
-                     'file': newfile,
-                     'hunk': addhunk,
-                     'range': addrange},
-            'context': {'file': newfile,
-                        'hunk': addhunk,
-                        'range': addrange},
-            'hunk': {'context': addcontext,
-                     'file': newfile,
-                     'range': addrange},
-            'range': {'context': addcontext,
-                      'hunk': addhunk},
-            }
-
-    p = parser()
-
-    state = 'context'
-    for newstate, data in scanpatch(fp):
-        try:
-            p.transitions[state][newstate](p, data)
-        except KeyError:
-            raise patch.PatchError('unhandled transition: %s -> %s' %
-                                   (state, newstate))
-        state = newstate
-    return p.finished()
-
-def filterpatch(ui, chunks, shouldprompt=True):
-    chunks = list(chunks)
-    chunks.reverse()
-    seen = {}
-    def consumefile():
-        consumed = []
-        while chunks:
-            if isinstance(chunks[-1], header):
-                break
-            else:
-                consumed.append(chunks.pop())
-        return consumed
-    
-    resp_all = [None]
-
-    """ If we're not to prompt (i.e. they specified the --all flag) 
-        we pre-emptively set the 'all' flag """
-    if shouldprompt == False:
-        resp_all = ['y']
-    
-    resp_file = [None]
-    applied = {}
-    def prompt(query):
-        if resp_all[0] is not None:
-            return resp_all[0]
-        if resp_file[0] is not None:
-            return resp_file[0]
-        while True:
-            resps = _('[Ynsfdaq?]')
-            choices = (_('&Yes, shelve this change'),
-                    _('&No, skip this change'),
-                    _('&Skip remaining changes to this file'),
-                    _('Shelve remaining changes to this &file'),
-                    _('&Done, skip remaining changes and files'),
-                    _('Shelve &all changes to all remaining files'),
-                    _('&Quit, shelving no changes'),
-                    _('&?'))
-            r = ui.promptchoice("%s %s " % (query, resps), choices)
-            if r == 7:
-                c = shelve.__doc__.find('y - shelve this change')
-                for l in shelve.__doc__[c:].splitlines():
-                    if l: ui.write(_(l.strip()) + '\n')
-                continue
-            elif r == 0: # yes
-                ret = 'y'
-            elif r == 1: # no
-                ret = 'n'
-            elif r == 2: # Skip
-                ret = resp_file[0] = 'n'
-            elif r == 3: # file (shelve remaining)
-                ret = resp_file[0] = 'y'
-            elif r == 4: # done, skip remaining
-                ret = resp_all[0] = 'n'
-            elif r == 5: # all
-                ret = resp_all[0] = 'y'
-            elif r == 6: # quit
-                raise util.Abort(_('user quit'))
-            return ret
-    while chunks:
-        chunk = chunks.pop()
-        if isinstance(chunk, header):
-            resp_file = [None]
-            fixoffset = 0
-            hdr = ''.join(chunk.header)
-            if hdr in seen:
-                consumefile()
-                continue
-            seen[hdr] = True
-            if resp_all[0] is None:
-                chunk.pretty(ui)
-            if shouldprompt == True:
-                r = prompt(_('shelve changes to %s?') %
-                       _(' and ').join(map(repr, chunk.files())))
-            else:
-                r = 'y'
-            
-            if r == 'y':
-                applied[chunk.filename()] = [chunk]
-                if chunk.allhunks():
-                    applied[chunk.filename()] += consumefile()
-            else:
-                consumefile()
-        else:
-            if resp_file[0] is None and resp_all[0] is None:
-                chunk.pretty(ui)
-            r = prompt(_('shelve this change to %r?') %
-                       chunk.filename())
-            if r == 'y':
-                if fixoffset:
-                    chunk = copy.copy(chunk)
-                    chunk.toline += fixoffset
-                applied[chunk.filename()].append(chunk)
-            else:
-                fixoffset += chunk.removed - chunk.added
-    return reduce(operator.add, [h for h in applied.itervalues()
-                                 if h[0].special() or len(h) > 1], [])
-
-def refilterpatch(allchunk, selected):
-    ''' return unshelved chunks of files to be shelved '''
-    l = []
-    fil = []
-    for c in allchunk:
-        if isinstance(c, header):
-            if len(l) > 1 and l[0] in selected:
-                fil += l
-            l = [c]
-        elif c not in selected:
-            l.append(c)
-    if len(l) > 1 and l[0] in selected:
-        fil += l
-    return fil
-
-def makebackup(ui, repo, dir, files):
-    try:
-        os.mkdir(dir)
-    except OSError, err:
-        if err.errno != errno.EEXIST:
-            raise
-
-    backups = {}
-    for f in files:
-        fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
-                                       dir=dir)
-        os.close(fd)
-        ui.debug('backup %r as %r\n' % (f, tmpname))
-        util.copyfile(repo.wjoin(f), tmpname)
-        backups[f] = tmpname
-
-    return backups
-
-def getshelfpath(repo, name):
-    if name:
-        shelfpath = "shelves/" + name
-    else:
-        # Check if a shelf from an older version exists
-        if os.path.isfile(repo.join('shelve')):
-            shelfpath = 'shelve'
-        else:
-            shelfpath = "shelves/default"
-    
-    return shelfpath
-    
-def shelve(ui, repo, *pats, **opts):
-    '''interactively select changes to set aside
-
-    If a list of files is omitted, all changes reported by "hg status"
-    will be candidates for shelving.
-
-    You will be prompted for whether to shelve changes to each
-    modified file, and for files with multiple changes, for each
-    change to use.
-
-    The shelve command works with the Color extension to display
-    diffs in color.
-
-    On each prompt, the following responses are possible::
-
-      y - shelve this change
-      n - skip this change
-
-      s - skip remaining changes to this file
-      f - shelve remaining changes to this file
-
-      d - done, skip remaining changes and files
-      a - shelve all changes to all remaining files
-      q - quit, shelving no changes
-
-      ? - display help'''
-
-    if not ui.interactive:
-        raise util.Abort(_('shelve can only be run interactively'))
-
-    # List all the active shelves by name and return '
-    if opts['list']:
-        listshelves(ui,repo)
-        return
-
-    forced = opts['force'] or opts['append']
-    
-    # Shelf name and path
-    shelfname = opts.get('name')
-    shelfpath = getshelfpath(repo, shelfname)
-    
-    if os.path.exists(repo.join(shelfpath)) and not forced:
-        raise util.Abort(_('shelve data already exists'))
-            
-    def shelvefunc(ui, repo, message, match, opts):
-        changes = repo.status(match=match)[:5]
-        modified, added, removed = changes[:3]
-        files = modified + added + removed
-        diffopts = mdiff.diffopts(git=True, nodates=True)
-        patch_diff = ''.join(patch.diff(repo, repo.dirstate.parents()[0],
-                           match=match, changes=changes, opts=diffopts))
-        
-        fp = cStringIO.StringIO(patch_diff)
-        ac = parsepatch(fp)
-        fp.close()
-        
-        chunks = filterpatch(ui, ac, not opts['all'])
-        rc = refilterpatch(ac, chunks)
-
-        contenders = {}
-        for h in chunks:
-            try: contenders.update(dict.fromkeys(h.files()))
-            except AttributeError: pass
-
-        newfiles = [f for f in files if f in contenders]
-
-        if not newfiles:
-            ui.status(_('no changes to shelve\n'))
-            return 0
-
-        modified = dict.fromkeys(changes[0])
-
-        backupdir = repo.join('shelve-backups')
-
-        try:
-            bkfiles = [f for f in newfiles if f in modified]
-            backups = makebackup(ui, repo, backupdir, bkfiles)
-            
-            # patch to shelve
-            sp = cStringIO.StringIO()
-            for c in chunks:
-                if c.filename() in backups:
-                    c.write(sp)
-            doshelve = sp.tell()
-            sp.seek(0)
-
-            # patch to apply to shelved files
-            fp = cStringIO.StringIO()
-            for c in rc:
-                if c.filename() in backups:
-                    c.write(fp)
-            dopatch = fp.tell()
-            fp.seek(0)
-
-            try:
-                # 3a. apply filtered patch to clean repo (clean)
-                if backups:
-                    hg.revert(repo, repo.dirstate.parents()[0], backups.has_key)
-
-                # 3b. apply filtered patch to clean repo (apply)
-                if dopatch:
-                    ui.debug('applying patch\n')
-                    ui.debug(fp.getvalue())
-                    patch.internalpatch(ui, repo, fp, 1)
-                del fp
-
-                # 3c. apply filtered patch to clean repo (shelve)
-                if doshelve:
-                    ui.debug("saving patch to shelve\n")
-                    if opts['append']:
-                        f = repo.opener(shelfpath, "a")
-                    else:
-                        f = repo.opener(shelfpath, "w")
-                    f.write(sp.getvalue())
-                    del f
-                del sp
-            except:
-                try:
-                    for realname, tmpname in backups.iteritems():
-                        ui.debug('restoring %r to %r\n' % (tmpname, realname))
-                        util.copyfile(tmpname, repo.wjoin(realname))
-                    ui.debug('removing shelve file\n')
-                    os.unlink(repo.join(shelfpath))
-                except OSError:
-                    pass
-
-            return 0
-        finally:
-            try:
-                for realname, tmpname in backups.iteritems():
-                    ui.debug('removing backup for %r : %r\n' % (realname, tmpname))
-                    os.unlink(tmpname)
-                os.rmdir(backupdir)
-            except OSError:
-                pass
-    fancyopts.fancyopts([], commands.commitopts, opts)
-    
-    # wrap ui.write so diff output can be labeled/colorized
-    def wrapwrite(orig, *args, **kw):
-        label = kw.pop('label', '')
-        if label: label += ' '
-        for chunk, l in patch.difflabel(lambda: args):
-            orig(chunk, label=label + l)
-    oldwrite = ui.write
-    extensions.wrapfunction(ui, 'write', wrapwrite)
-    try:
-        return cmdutil.commit(ui, repo, shelvefunc, pats, opts)
-    finally:
-        ui.write = oldwrite
-
-def listshelves(ui, repo):
-    # Check for shelve file at old location first
-    if os.path.isfile(repo.join('shelve')):
-        ui.status('default\n')
-    
-    # Now go through all the files in the shelves folder and list them out
-    dirname = repo.join('shelves')
-    if os.path.isdir(dirname):
-        for filename in os.listdir(repo.join('shelves')):
-            ui.status(filename + '\n')
-    
-def unshelve(ui, repo, **opts):
-    '''restore shelved changes'''
-
-    # Shelf name and path
-    shelfname = opts.get('name')
-    shelfpath = getshelfpath(repo, shelfname)
-
-    # List all the active shelves by name and return '
-    if opts['list']:
-        listshelves(ui,repo)
-        return
-        
-    try:
-        patch_diff = repo.opener(shelfpath).read()
-        fp = cStringIO.StringIO(patch_diff)
-        if opts['inspect']:
-            # wrap ui.write so diff output can be labeled/colorized
-            def wrapwrite(orig, *args, **kw):
-                label = kw.pop('label', '')
-                if label: label += ' '
-                for chunk, l in patch.difflabel(lambda: args):
-                    orig(chunk, label=label + l)
-            oldwrite = ui.write
-            extensions.wrapfunction(ui, 'write', wrapwrite)
-            try:
-                ui.status(fp.getvalue())
-            finally:
-                ui.write = oldwrite
-        else:
-            files = []
-            ac = parsepatch(fp)
-            for chunk in ac:
-                if isinstance(chunk, header):
-                    files += chunk.files()
-            backupdir = repo.join('shelve-backups')
-            backups = makebackup(ui, repo, backupdir, set(files))
-
-            ui.debug('applying shelved patch\n')
-            patchdone = 0
-            try:
-                try:
-                    fp.seek(0)
-                    patch.internalpatch(ui, repo, fp, 1)
-                    patchdone = 1
-                except:
-                    if opts['force']:
-                        patchdone = 1
-                    else:
-                        ui.status('restoring backup files\n')
-                        for realname, tmpname in backups.iteritems():
-                            ui.debug('restoring %r to %r\n' % 
-                                     (tmpname, realname))
-                            util.copyfile(tmpname, repo.wjoin(realname))
-            finally:
-                try:
-                    ui.debug('removing backup files\n')
-                    shutil.rmtree(backupdir, True)
-                except OSError:
-                    pass
-
-            if patchdone:
-                ui.debug("removing shelved patches\n")
-                os.unlink(repo.join(shelfpath))
-                ui.status("unshelve completed\n")
-    except IOError:
-        ui.warn('nothing to unshelve\n')
-
-cmdtable = {
-    "shelve":
-        (shelve,
-         [('A', 'addremove', None,
-           _('mark new/missing files as added/removed before shelving')),
-          ('f', 'force', None,
-           _('overwrite existing shelve data')),
-          ('a', 'append', None,
-           _('append to existing shelve data')),
-          ('', 'all', None,
-           _('shelve all changes')),
-          ('n', 'name', '',
-           _('shelve changes to specified shelf name')),
-           ('l', 'list', None, _('list active shelves')),
-         ] + commands.walkopts,
-         _('hg shelve [OPTION]... [FILE]...')),
-    "unshelve":
-        (unshelve,
-         [('i', 'inspect', None, _('inspect shelved changes only')),
-          ('f', 'force', None, 
-           _('proceed even if patches do not unshelve cleanly')),
-           ('n', 'name', '',
-            _('unshelve changes from specified shelf name')),
-           ('l', 'list', None, _('list active shelves')),
-         ],
-         _('hg unshelve [OPTION]...')),
-}

hgshelve/__init__.py

+# shelve.py
+#
+# Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
+# Copyright 2007 TK Soh <teekaysoh@gmailcom>
+#
+# This software may be used and distributed according to the terms of
+# the GNU General Public License, incorporated herein by reference.
+
+'''interactive change selection to set aside that may be restored later'''
+
+from mercurial.i18n import _
+from mercurial import cmdutil, commands, cmdutil, hg, mdiff, patch, revlog
+from mercurial import util, fancyopts, extensions
+import copy, cStringIO, errno, operator, os, re, shutil, tempfile
+
+lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)')
+
+def scanpatch(fp):
+    lr = patch.linereader(fp)
+
+    def scanwhile(first, p):
+        lines = [first]
+        while True:
+            line = lr.readline()
+            if not line:
+                break
+            if p(line):
+                lines.append(line)
+            else:
+                lr.push(line)
+                break
+        return lines
+
+    while True:
+        line = lr.readline()
+        if not line:
+            break
+        if line.startswith('diff --git a/'):
+            def notheader(line):
+                s = line.split(None, 1)
+                return not s or s[0] not in ('---', 'diff')
+            header = scanwhile(line, notheader)
+            fromfile = lr.readline()
+            if fromfile.startswith('---'):
+                tofile = lr.readline()
+                header += [fromfile, tofile]
+            else:
+                lr.push(fromfile)
+            yield 'file', header
+        elif line[0] == ' ':
+            yield 'context', scanwhile(line, lambda l: l[0] in ' \\')
+        elif line[0] in '-+':
+            yield 'hunk', scanwhile(line, lambda l: l[0] in '-+\\')
+        else:
+            m = lines_re.match(line)
+            if m:
+                yield 'range', m.groups()
+            else:
+                raise patch.PatchError('unknown patch content: %r' % line)
+
+class header(object):
+    diff_re = re.compile('diff --git a/(.*) b/(.*)$')
+    allhunks_re = re.compile('(?:index|new file|deleted file) ')
+    pretty_re = re.compile('(?:new file|deleted file) ')
+    special_re = re.compile('(?:index|new|deleted|copy|rename) ')
+
+    def __init__(self, header):
+        self.header = header
+        self.hunks = []
+
+    def binary(self):
+        for h in self.header:
+            if h.startswith('index '):
+                return True
+
+    def pretty(self, fp):
+        for h in self.header:
+            if h.startswith('index '):
+                fp.write(_('this modifies a binary file (all or nothing)\n'))
+                break
+            if self.pretty_re.match(h):
+                fp.write(h)
+                if self.binary():
+                    fp.write(_('this is a binary file\n'))
+                break
+            if h.startswith('---'):
+                fp.write(_('%d hunks, %d lines changed\n') %
+                         (len(self.hunks),
+                          sum([h.added + h.removed for h in self.hunks])))
+                break
+            fp.write(h)
+
+    def write(self, fp):
+        fp.write(''.join(self.header))
+
+    def allhunks(self):
+        for h in self.header:
+            if self.allhunks_re.match(h):
+                return True
+
+    def files(self):
+        fromfile, tofile = self.diff_re.match(self.header[0]).groups()
+        if fromfile == tofile:
+            return [fromfile]
+        return [fromfile, tofile]
+
+    def filename(self):
+        return self.files()[-1]
+
+    def __repr__(self):
+        return '<header %s>' % (' '.join(map(repr, self.files())))
+
+    def special(self):
+        for h in self.header:
+            if self.special_re.match(h):
+                return True
+
+def countchanges(hunk):
+    add = len([h for h in hunk if h[0] == '+'])
+    rem = len([h for h in hunk if h[0] == '-'])
+    return add, rem
+
+class hunk(object):
+    maxcontext = 3
+
+    def __init__(self, header, fromline, toline, proc, before, hunk, after):
+        def trimcontext(number, lines):
+            delta = len(lines) - self.maxcontext
+            if False and delta > 0:
+                return number + delta, lines[:self.maxcontext]
+            return number, lines
+
+        self.header = header
+        self.fromline, self.before = trimcontext(fromline, before)
+        self.toline, self.after = trimcontext(toline, after)
+        self.proc = proc
+        self.hunk = hunk
+        self.added, self.removed = countchanges(self.hunk)
+
+    def __cmp__(self, rhs):
+        # since the hunk().toline needs to be adjusted when hunks are
+        # removed/added, we can't take it into account when we cmp
+        attrs = ['header', 'fromline', 'proc', 'hunk', 'added', 'removed']
+        for attr in attrs:
+            selfattr = getattr(self, attr, None)
+            rhsattr = getattr(rhs, attr, None)
+
+            if selfattr is None or rhsattr is None:
+                raise util.Abort(_('non-existant attribute %s') % attr)
+
+            rv = cmp(selfattr, rhsattr)
+            if rv != 0:
+                return rv
+        return rv
+
+
+    def write(self, fp):
+        delta = len(self.before) + len(self.after)
+        if self.after and self.after[-1] == '\\ No newline at end of file\n':
+            delta -= 1
+        fromlen = delta + self.removed
+        tolen = delta + self.added
+        fp.write('@@ -%d,%d +%d,%d @@%s\n' %
+                 (self.fromline, fromlen, self.toline, tolen,
+                  self.proc and (' ' + self.proc)))
+        fp.write(''.join(self.before + self.hunk + self.after))
+
+    pretty = write
+
+    def filename(self):
+        return self.header.filename()
+
+    def __repr__(self):
+        return '<hunk %r@%d>' % (self.filename(), self.fromline)
+
+def parsepatch(fp):
+    class parser(object):
+        def __init__(self):
+            self.fromline = 0
+            self.toline = 0
+            self.proc = ''
+            self.header = None
+            self.context = []
+            self.before = []
+            self.hunk = []
+            self.stream = []
+
+        def addrange(self, (fromstart, fromend, tostart, toend, proc)):
+            self.fromline = int(fromstart)
+            self.toline = int(tostart)
+            self.proc = proc
+
+        def addcontext(self, context):
+            if self.hunk:
+                h = hunk(self.header, self.fromline, self.toline, self.proc,
+                         self.before, self.hunk, context)
+                self.header.hunks.append(h)
+                self.stream.append(h)
+                self.fromline += len(self.before) + h.removed
+                self.toline += len(self.before) + h.added
+                self.before = []
+                self.hunk = []
+                self.proc = ''
+            self.context = context
+
+        def addhunk(self, hunk):
+            if self.context:
+                self.before = self.context
+                self.context = []
+            self.hunk = hunk
+
+        def newfile(self, hdr):
+            self.addcontext([])
+            h = header(hdr)
+            self.stream.append(h)
+            self.header = h
+
+        def finished(self):
+            self.addcontext([])
+            return self.stream
+
+        transitions = {
+            'file': {'context': addcontext,
+                     'file': newfile,
+                     'hunk': addhunk,
+                     'range': addrange},
+            'context': {'file': newfile,
+                        'hunk': addhunk,
+                        'range': addrange},
+            'hunk': {'context': addcontext,
+                     'file': newfile,
+                     'range': addrange},
+            'range': {'context': addcontext,
+                      'hunk': addhunk},
+            }
+
+    p = parser()
+
+    state = 'context'
+    for newstate, data in scanpatch(fp):
+        try:
+            p.transitions[state][newstate](p, data)
+        except KeyError:
+            raise patch.PatchError('unhandled transition: %s -> %s' %
+                                   (state, newstate))
+        state = newstate
+    return p.finished()
+
+def filterpatch(ui, chunks, shouldprompt=True):
+    chunks = list(chunks)
+    chunks.reverse()
+    seen = {}
+    def consumefile():
+        consumed = []
+        while chunks:
+            if isinstance(chunks[-1], header):
+                break
+            else:
+                consumed.append(chunks.pop())
+        return consumed
+    
+    resp_all = [None]
+
+    """ If we're not to prompt (i.e. they specified the --all flag) 
+        we pre-emptively set the 'all' flag """
+    if shouldprompt == False:
+        resp_all = ['y']
+    
+    resp_file = [None]
+    applied = {}
+    def prompt(query):
+        if resp_all[0] is not None:
+            return resp_all[0]
+        if resp_file[0] is not None:
+            return resp_file[0]
+        while True:
+            resps = _('[Ynsfdaq?]')
+            choices = (_('&Yes, shelve this change'),
+                    _('&No, skip this change'),
+                    _('&Skip remaining changes to this file'),
+                    _('Shelve remaining changes to this &file'),
+                    _('&Done, skip remaining changes and files'),
+                    _('Shelve &all changes to all remaining files'),
+                    _('&Quit, shelving no changes'),
+                    _('&?'))
+            r = ui.promptchoice("%s %s " % (query, resps), choices)
+            if r == 7:
+                c = shelve.__doc__.find('y - shelve this change')
+                for l in shelve.__doc__[c:].splitlines():
+                    if l: ui.write(_(l.strip()) + '\n')
+                continue
+            elif r == 0: # yes
+                ret = 'y'
+            elif r == 1: # no
+                ret = 'n'
+            elif r == 2: # Skip
+                ret = resp_file[0] = 'n'
+            elif r == 3: # file (shelve remaining)
+                ret = resp_file[0] = 'y'
+            elif r == 4: # done, skip remaining
+                ret = resp_all[0] = 'n'
+            elif r == 5: # all
+                ret = resp_all[0] = 'y'
+            elif r == 6: # quit
+                raise util.Abort(_('user quit'))
+            return ret
+    while chunks:
+        chunk = chunks.pop()
+        if isinstance(chunk, header):
+            resp_file = [None]
+            fixoffset = 0
+            hdr = ''.join(chunk.header)
+            if hdr in seen:
+                consumefile()
+                continue
+            seen[hdr] = True
+            if resp_all[0] is None:
+                chunk.pretty(ui)
+            if shouldprompt == True:
+                r = prompt(_('shelve changes to %s?') %
+                       _(' and ').join(map(repr, chunk.files())))
+            else:
+                r = 'y'
+            
+            if r == 'y':
+                applied[chunk.filename()] = [chunk]
+                if chunk.allhunks():
+                    applied[chunk.filename()] += consumefile()
+            else:
+                consumefile()
+        else:
+            if resp_file[0] is None and resp_all[0] is None:
+                chunk.pretty(ui)
+            r = prompt(_('shelve this change to %r?') %
+                       chunk.filename())
+            if r == 'y':
+                if fixoffset:
+                    chunk = copy.copy(chunk)
+                    chunk.toline += fixoffset
+                applied[chunk.filename()].append(chunk)
+            else:
+                fixoffset += chunk.removed - chunk.added
+    return reduce(operator.add, [h for h in applied.itervalues()
+                                 if h[0].special() or len(h) > 1], [])
+
+def refilterpatch(allchunk, selected):
+    ''' return unshelved chunks of files to be shelved '''
+    l = []
+    fil = []
+    for c in allchunk:
+        if isinstance(c, header):
+            if len(l) > 1 and l[0] in selected:
+                fil += l
+            l = [c]
+        elif c not in selected:
+            l.append(c)
+    if len(l) > 1 and l[0] in selected:
+        fil += l
+    return fil
+
+def makebackup(ui, repo, dir, files):
+    try:
+        os.mkdir(dir)
+    except OSError, err:
+        if err.errno != errno.EEXIST:
+            raise
+
+    backups = {}
+    for f in files:
+        fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
+                                       dir=dir)
+        os.close(fd)
+        ui.debug('backup %r as %r\n' % (f, tmpname))
+        util.copyfile(repo.wjoin(f), tmpname)
+        backups[f] = tmpname
+
+    return backups
+
+def getshelfpath(repo, name):
+    if name:
+        shelfpath = "shelves/" + name
+    else:
+        # Check if a shelf from an older version exists
+        if os.path.isfile(repo.join('shelve')):
+            shelfpath = 'shelve'
+        else:
+            shelfpath = "shelves/default"
+    
+    return shelfpath
+    
+def shelve(ui, repo, *pats, **opts):
+    '''interactively select changes to set aside
+
+    If a list of files is omitted, all changes reported by "hg status"
+    will be candidates for shelving.
+
+    You will be prompted for whether to shelve changes to each
+    modified file, and for files with multiple changes, for each
+    change to use.
+
+    The shelve command works with the Color extension to display
+    diffs in color.
+
+    On each prompt, the following responses are possible::
+
+      y - shelve this change
+      n - skip this change
+
+      s - skip remaining changes to this file
+      f - shelve remaining changes to this file
+
+      d - done, skip remaining changes and files
+      a - shelve all changes to all remaining files
+      q - quit, shelving no changes
+
+      ? - display help'''
+
+    if not ui.interactive:
+        raise util.Abort(_('shelve can only be run interactively'))
+
+    # List all the active shelves by name and return '
+    if opts['list']:
+        listshelves(ui,repo)
+        return
+
+    forced = opts['force'] or opts['append']
+    
+    # Shelf name and path
+    shelfname = opts.get('name')
+    shelfpath = getshelfpath(repo, shelfname)
+    
+    if os.path.exists(repo.join(shelfpath)) and not forced:
+        raise util.Abort(_('shelve data already exists'))
+            
+    def shelvefunc(ui, repo, message, match, opts):
+        changes = repo.status(match=match)[:5]
+        modified, added, removed = changes[:3]
+        files = modified + added + removed
+        diffopts = mdiff.diffopts(git=True, nodates=True)
+        patch_diff = ''.join(patch.diff(repo, repo.dirstate.parents()[0],
+                           match=match, changes=changes, opts=diffopts))
+        
+        fp = cStringIO.StringIO(patch_diff)
+        ac = parsepatch(fp)
+        fp.close()
+        
+        chunks = filterpatch(ui, ac, not opts['all'])
+        rc = refilterpatch(ac, chunks)
+
+        contenders = {}
+        for h in chunks:
+            try: contenders.update(dict.fromkeys(h.files()))
+            except AttributeError: pass
+
+        newfiles = [f for f in files if f in contenders]
+
+        if not newfiles:
+            ui.status(_('no changes to shelve\n'))
+            return 0
+
+        modified = dict.fromkeys(changes[0])
+
+        backupdir = repo.join('shelve-backups')
+
+        try:
+            bkfiles = [f for f in newfiles if f in modified]
+            backups = makebackup(ui, repo, backupdir, bkfiles)
+            
+            # patch to shelve
+            sp = cStringIO.StringIO()
+            for c in chunks:
+                if c.filename() in backups:
+                    c.write(sp)
+            doshelve = sp.tell()
+            sp.seek(0)
+
+            # patch to apply to shelved files
+            fp = cStringIO.StringIO()
+            for c in rc:
+                if c.filename() in backups:
+                    c.write(fp)
+            dopatch = fp.tell()
+            fp.seek(0)
+
+            try:
+                # 3a. apply filtered patch to clean repo (clean)
+                if backups:
+                    hg.revert(repo, repo.dirstate.parents()[0], backups.has_key)
+
+                # 3b. apply filtered patch to clean repo (apply)
+                if dopatch:
+                    ui.debug('applying patch\n')
+                    ui.debug(fp.getvalue())
+                    patch.internalpatch(ui, repo, fp, 1)
+                del fp
+
+                # 3c. apply filtered patch to clean repo (shelve)
+                if doshelve:
+                    ui.debug("saving patch to shelve\n")
+                    if opts['append']:
+                        f = repo.opener(shelfpath, "a")
+                    else:
+                        f = repo.opener(shelfpath, "w")
+                    f.write(sp.getvalue())
+                    del f
+                del sp
+            except:
+                try:
+                    for realname, tmpname in backups.iteritems():
+                        ui.debug('restoring %r to %r\n' % (tmpname, realname))
+                        util.copyfile(tmpname, repo.wjoin(realname))
+                    ui.debug('removing shelve file\n')
+                    os.unlink(repo.join(shelfpath))
+                except OSError:
+                    pass
+
+            return 0
+        finally:
+            try:
+                for realname, tmpname in backups.iteritems():
+                    ui.debug('removing backup for %r : %r\n' % (realname, tmpname))
+                    os.unlink(tmpname)
+                os.rmdir(backupdir)
+            except OSError:
+                pass
+    fancyopts.fancyopts([], commands.commitopts, opts)
+    
+    # wrap ui.write so diff output can be labeled/colorized
+    def wrapwrite(orig, *args, **kw):
+        label = kw.pop('label', '')
+        if label: label += ' '
+        for chunk, l in patch.difflabel(lambda: args):
+            orig(chunk, label=label + l)
+    oldwrite = ui.write
+    extensions.wrapfunction(ui, 'write', wrapwrite)
+    try:
+        return cmdutil.commit(ui, repo, shelvefunc, pats, opts)
+    finally:
+        ui.write = oldwrite
+
+def listshelves(ui, repo):
+    # Check for shelve file at old location first
+    if os.path.isfile(repo.join('shelve')):
+        ui.status('default\n')
+    
+    # Now go through all the files in the shelves folder and list them out
+    dirname = repo.join('shelves')
+    if os.path.isdir(dirname):
+        for filename in os.listdir(repo.join('shelves')):
+            ui.status(filename + '\n')
+    
+def unshelve(ui, repo, **opts):
+    '''restore shelved changes'''
+
+    # Shelf name and path
+    shelfname = opts.get('name')
+    shelfpath = getshelfpath(repo, shelfname)
+
+    # List all the active shelves by name and return '
+    if opts['list']:
+        listshelves(ui,repo)
+        return
+        
+    try:
+        patch_diff = repo.opener(shelfpath).read()
+        fp = cStringIO.StringIO(patch_diff)
+        if opts['inspect']:
+            # wrap ui.write so diff output can be labeled/colorized
+            def wrapwrite(orig, *args, **kw):
+                label = kw.pop('label', '')
+                if label: label += ' '
+                for chunk, l in patch.difflabel(lambda: args):
+                    orig(chunk, label=label + l)
+            oldwrite = ui.write
+            extensions.wrapfunction(ui, 'write', wrapwrite)
+            try:
+                ui.status(fp.getvalue())
+            finally:
+                ui.write = oldwrite
+        else:
+            files = []
+            ac = parsepatch(fp)
+            for chunk in ac:
+                if isinstance(chunk, header):
+                    files += chunk.files()
+            backupdir = repo.join('shelve-backups')
+            backups = makebackup(ui, repo, backupdir, set(files))
+
+            ui.debug('applying shelved patch\n')
+            patchdone = 0
+            try:
+                try:
+                    fp.seek(0)
+                    patch.internalpatch(ui, repo, fp, 1)
+                    patchdone = 1
+                except:
+                    if opts['force']:
+                        patchdone = 1
+                    else:
+                        ui.status('restoring backup files\n')
+                        for realname, tmpname in backups.iteritems():
+                            ui.debug('restoring %r to %r\n' % 
+                                     (tmpname, realname))
+                            util.copyfile(tmpname, repo.wjoin(realname))
+            finally:
+                try:
+                    ui.debug('removing backup files\n')
+                    shutil.rmtree(backupdir, True)
+                except OSError:
+                    pass
+
+            if patchdone:
+                ui.debug("removing shelved patches\n")
+                os.unlink(repo.join(shelfpath))
+                ui.status("unshelve completed\n")
+    except IOError:
+        ui.warn('nothing to unshelve\n')
+
+cmdtable = {
+    "shelve":
+        (shelve,
+         [('A', 'addremove', None,
+           _('mark new/missing files as added/removed before shelving')),
+          ('f', 'force', None,
+           _('overwrite existing shelve data')),
+          ('a', 'append', None,
+           _('append to existing shelve data')),
+          ('', 'all', None,
+           _('shelve all changes')),
+          ('n', 'name', '',
+           _('shelve changes to specified shelf name')),
+           ('l', 'list', None, _('list active shelves')),
+         ] + commands.walkopts,
+         _('hg shelve [OPTION]... [FILE]...')),
+    "unshelve":
+        (unshelve,
+         [('i', 'inspect', None, _('inspect shelved changes only')),
+          ('f', 'force', None, 
+           _('proceed even if patches do not unshelve cleanly')),
+           ('n', 'name', '',
+            _('unshelve changes from specified shelf name')),
+           ('l', 'list', None, _('list active shelves')),
+         ],
+         _('hg unshelve [OPTION]...')),
+}
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
+#!/usr/bin/env python
+#This file is part of hgshelve.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup
+
+setup(name='hgshelve',
+      version='0.1',
+      author='TK Soh',
+      author_email='teekaysoh@gmail.com',
+      url="https://bitbucket.org/tksoh/hgshelve",
+      description="Shelve Extension for Mercurial",
+      long_description=open('README').read(),
+      download_url="http://mercurial.selenic.com/wiki/ShelveExtension",
+      packages=['hgshelve'],
+      classifiers=[
+          'Development Status :: 5 - Production/Stable',
+          'Environment :: Plugins',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: GNU General Public License (GPL)',
+          'Operating System :: OS Independent',
+          'Programming Language :: Python',
+          'Topic :: Software Development :: Version Control',
+      ],
+      license='GPL-2',
+      install_requires=[
+          'Mercurial >= 1.9.0',
+      ],
+     )