mdw@git.distorted.org.uk Git - stgit/blob - stgit/stack.py

   1 """Basic quilt-like functionality
   2 """
   3
   4 __copyright__ = """
   5 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
   6
   7 This program is free software; you can redistribute it and/or modify
   8 it under the terms of the GNU General Public License version 2 as
   9 published by the Free Software Foundation.
  10
  11 This program is distributed in the hope that it will be useful,
  12 but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  14 GNU General Public License for more details.
  15
  16 You should have received a copy of the GNU General Public License
  17 along with this program; if not, write to the Free Software
  18 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  19 """
  20
  21 import sys, os
  22
  23 from stgit.utils import *
  24 from stgit import git
  25 from stgit.config import config
  26
  27
  28 # stack exception class
  29 class StackException(Exception):
  30     pass
  31
  32 class FilterUntil:
  33     def __init__(self):
  34         self.should_print = True
  35     def __call__(self, x, until_test, prefix):
  36         if until_test(x):
  37             self.should_print = False
  38         if self.should_print:
  39             return x[0:len(prefix)] != prefix
  40         return False
  41
  42 #
  43 # Functions
  44 #
  45 __comment_prefix = 'STG:'
  46 __patch_prefix = 'STG_PATCH:'
  47
  48 def __clean_comments(f):
  49     """Removes lines marked for status in a commit file
  50     """
  51     f.seek(0)
  52
  53     # remove status-prefixed lines
  54     lines = f.readlines()
  55
  56     patch_filter = FilterUntil()
  57     until_test = lambda t: t == (__patch_prefix + '\n')
  58     lines = [l for l in lines if patch_filter(l, until_test, __comment_prefix)]
  59
  60     # remove empty lines at the end
  61     while len(lines) != 0 and lines[-1] == '\n':
  62         del lines[-1]
  63
  64     f.seek(0); f.truncate()
  65     f.writelines(lines)
  66
  67 def edit_file(series, line, comment, show_patch = True):
  68     fname = '.stgit.msg'
  69     tmpl = os.path.join(git.get_base_dir(), 'patchdescr.tmpl')
  70
  71     f = file(fname, 'w+')
  72     if line:
  73         print >> f, line
  74     elif os.path.isfile(tmpl):
  75         print >> f, file(tmpl).read().rstrip()
  76     else:
  77         print >> f
  78     print >> f, __comment_prefix, comment
  79     print >> f, __comment_prefix, \
  80           'Lines prefixed with "%s" will be automatically removed.' \
  81           % __comment_prefix
  82     print >> f, __comment_prefix, \
  83           'Trailing empty lines will be automatically removed.'
  84
  85     if show_patch:
  86        print >> f, __patch_prefix
  87        # series.get_patch(series.get_current()).get_top()
  88        git.diff([], series.get_patch(series.get_current()).get_bottom(), None, f)
  89
  90     #Vim modeline must be near the end.
  91     print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'
  92     f.close()
  93
  94     # the editor
  95     if config.has_option('stgit', 'editor'):
  96         editor = config.get('stgit', 'editor')
  97     elif 'EDITOR' in os.environ:
  98         editor = os.environ['EDITOR']
  99     else:
 100         editor = 'vi'
 101     editor += ' %s' % fname
 102
 103     print 'Invoking the editor: "%s"...' % editor,
 104     sys.stdout.flush()
 105     print 'done (exit code: %d)' % os.system(editor)
 106
 107     f = file(fname, 'r+')
 108
 109     __clean_comments(f)
 110     f.seek(0)
 111     result = f.read()
 112
 113     f.close()
 114     os.remove(fname)
 115
 116     return result
 117
 118 #
 119 # Classes
 120 #
 121
 122 class Patch:
 123     """Basic patch implementation
 124     """
 125     def __init__(self, name, series_dir, refs_dir):
 126         self.__series_dir = series_dir
 127         self.__name = name
 128         self.__dir = os.path.join(self.__series_dir, self.__name)
 129         self.__refs_dir = refs_dir
 130         self.__top_ref_file = os.path.join(self.__refs_dir, self.__name)
 131
 132     def create(self):
 133         os.mkdir(self.__dir)
 134         create_empty_file(os.path.join(self.__dir, 'bottom'))
 135         create_empty_file(os.path.join(self.__dir, 'top'))
 136
 137     def delete(self):
 138         for f in os.listdir(self.__dir):
 139             os.remove(os.path.join(self.__dir, f))
 140         os.rmdir(self.__dir)
 141         os.remove(self.__top_ref_file)
 142
 143     def get_name(self):
 144         return self.__name
 145
 146     def rename(self, newname):
 147         olddir = self.__dir
 148         old_ref_file = self.__top_ref_file
 149         self.__name = newname
 150         self.__dir = os.path.join(self.__series_dir, self.__name)
 151         self.__top_ref_file = os.path.join(self.__refs_dir, self.__name)
 152
 153         os.rename(olddir, self.__dir)
 154         os.rename(old_ref_file, self.__top_ref_file)
 155
 156     def __update_top_ref(self, ref):
 157         write_string(self.__top_ref_file, ref)
 158
 159     def update_top_ref(self):
 160         top = self.get_top()
 161         if top:
 162             self.__update_top_ref(top)
 163
 164     def __get_field(self, name, multiline = False):
 165         id_file = os.path.join(self.__dir, name)
 166         if os.path.isfile(id_file):
 167             line = read_string(id_file, multiline)
 168             if line == '':
 169                 return None
 170             else:
 171                 return line
 172         else:
 173             return None
 174
 175     def __set_field(self, name, value, multiline = False):
 176         fname = os.path.join(self.__dir, name)
 177         if value and value != '':
 178             write_string(fname, value, multiline)
 179         elif os.path.isfile(fname):
 180             os.remove(fname)
 181
 182     def get_old_bottom(self):
 183         return self.__get_field('bottom.old')
 184
 185     def get_bottom(self):
 186         return self.__get_field('bottom')
 187
 188     def set_bottom(self, value, backup = False):
 189         if backup:
 190             curr = self.__get_field('bottom')
 191             if curr != value:
 192                 self.__set_field('bottom.old', curr)
 193             else:
 194                 self.__set_field('bottom.old', None)
 195         self.__set_field('bottom', value)
 196
 197     def get_old_top(self):
 198         return self.__get_field('top.old')
 199
 200     def get_top(self):
 201         return self.__get_field('top')
 202
 203     def set_top(self, value, backup = False):
 204         if backup:
 205             curr = self.__get_field('top')
 206             if curr != value:
 207                 self.__set_field('top.old', curr)
 208             else:
 209                 self.__set_field('top.old', None)
 210         self.__set_field('top', value)
 211         self.__update_top_ref(value)
 212
 213     def restore_old_boundaries(self):
 214         bottom = self.__get_field('bottom.old')
 215         top = self.__get_field('top.old')
 216
 217         if top and bottom:
 218             self.__set_field('bottom', bottom)
 219             self.__set_field('top', top)
 220             self.__update_top_ref(top)
 221             return True
 222         else:
 223             return False
 224
 225     def get_description(self):
 226         return self.__get_field('description', True)
 227
 228     def set_description(self, line):
 229         self.__set_field('description', line, True)
 230
 231     def get_authname(self):
 232         return self.__get_field('authname')
 233
 234     def set_authname(self, name):
 235         if not name:
 236             if config.has_option('stgit', 'authname'):
 237                 name = config.get('stgit', 'authname')
 238             elif 'GIT_AUTHOR_NAME' in os.environ:
 239                 name = os.environ['GIT_AUTHOR_NAME']
 240         self.__set_field('authname', name)
 241
 242     def get_authemail(self):
 243         return self.__get_field('authemail')
 244
 245     def set_authemail(self, address):
 246         if not address:
 247             if config.has_option('stgit', 'authemail'):
 248                 address = config.get('stgit', 'authemail')
 249             elif 'GIT_AUTHOR_EMAIL' in os.environ:
 250                 address = os.environ['GIT_AUTHOR_EMAIL']
 251         self.__set_field('authemail', address)
 252
 253     def get_authdate(self):
 254         return self.__get_field('authdate')
 255
 256     def set_authdate(self, date):
 257         if not date and 'GIT_AUTHOR_DATE' in os.environ:
 258             date = os.environ['GIT_AUTHOR_DATE']
 259         self.__set_field('authdate', date)
 260
 261     def get_commname(self):
 262         return self.__get_field('commname')
 263
 264     def set_commname(self, name):
 265         if not name:
 266             if config.has_option('stgit', 'commname'):
 267                 name = config.get('stgit', 'commname')
 268             elif 'GIT_COMMITTER_NAME' in os.environ:
 269                 name = os.environ['GIT_COMMITTER_NAME']
 270         self.__set_field('commname', name)
 271
 272     def get_commemail(self):
 273         return self.__get_field('commemail')
 274
 275     def set_commemail(self, address):
 276         if not address:
 277             if config.has_option('stgit', 'commemail'):
 278                 address = config.get('stgit', 'commemail')
 279             elif 'GIT_COMMITTER_EMAIL' in os.environ:
 280                 address = os.environ['GIT_COMMITTER_EMAIL']
 281         self.__set_field('commemail', address)
 282
 283
 284 class Series:
 285     """Class including the operations on series
 286     """
 287     def __init__(self, name = None):
 288         """Takes a series name as the parameter.
 289         """
 290         try:
 291             if name:
 292                 self.__name = name
 293             else:
 294                 self.__name = git.get_head_file()
 295             self.__base_dir = git.get_base_dir()
 296         except git.GitException, ex:
 297             raise StackException, 'GIT tree not initialised: %s' % ex
 298
 299         self.__series_dir = os.path.join(self.__base_dir, 'patches',
 300                                          self.__name)
 301         self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches',
 302                                        self.__name)
 303         self.__base_file = os.path.join(self.__base_dir, 'refs', 'bases',
 304                                         self.__name)
 305
 306         self.__applied_file = os.path.join(self.__series_dir, 'applied')
 307         self.__unapplied_file = os.path.join(self.__series_dir, 'unapplied')
 308         self.__current_file = os.path.join(self.__series_dir, 'current')
 309         self.__descr_file = os.path.join(self.__series_dir, 'description')
 310
 311         # where this series keeps its patches
 312         self.__patch_dir = os.path.join(self.__series_dir, 'patches')
 313         if not os.path.isdir(self.__patch_dir):
 314             self.__patch_dir = self.__series_dir
 315
 316         # if no __refs_dir, create and populate it (upgrade old repositories)
 317         if self.is_initialised() and not os.path.isdir(self.__refs_dir):
 318             os.makedirs(self.__refs_dir)
 319             for patch in self.get_applied() + self.get_unapplied():
 320                 self.get_patch(patch).update_top_ref()
 321
 322     def get_branch(self):
 323         """Return the branch name for the Series object
 324         """
 325         return self.__name
 326
 327     def __set_current(self, name):
 328         """Sets the topmost patch
 329         """
 330         if name:
 331             write_string(self.__current_file, name)
 332         else:
 333             create_empty_file(self.__current_file)
 334
 335     def get_patch(self, name):
 336         """Return a Patch object for the given name
 337         """
 338         return Patch(name, self.__patch_dir, self.__refs_dir)
 339
 340     def get_current(self):
 341         """Return a Patch object representing the topmost patch
 342         """
 343         if os.path.isfile(self.__current_file):
 344             name = read_string(self.__current_file)
 345         else:
 346             return None
 347         if name == '':
 348             return None
 349         else:
 350             return name
 351
 352     def get_applied(self):
 353         if not os.path.isfile(self.__applied_file):
 354             raise StackException, 'Branch "%s" not initialised' % self.__name
 355         f = file(self.__applied_file)
 356         names = [line.strip() for line in f.readlines()]
 357         f.close()
 358         return names
 359
 360     def get_unapplied(self):
 361         if not os.path.isfile(self.__unapplied_file):
 362             raise StackException, 'Branch "%s" not initialised' % self.__name
 363         f = file(self.__unapplied_file)
 364         names = [line.strip() for line in f.readlines()]
 365         f.close()
 366         return names
 367
 368     def get_base_file(self):
 369         return self.__base_file
 370
 371     def get_protected(self):
 372         return os.path.isfile(os.path.join(self.__series_dir, 'protected'))
 373
 374     def protect(self):
 375         protect_file = os.path.join(self.__series_dir, 'protected')
 376         if not os.path.isfile(protect_file):
 377             create_empty_file(protect_file)
 378
 379     def unprotect(self):
 380         protect_file = os.path.join(self.__series_dir, 'protected')
 381         if os.path.isfile(protect_file):
 382             os.remove(protect_file)
 383
 384     def get_description(self):
 385         if os.path.isfile(self.__descr_file):
 386             return read_string(self.__descr_file)
 387         else:
 388             return ''
 389
 390     def __patch_is_current(self, patch):
 391         return patch.get_name() == read_string(self.__current_file)
 392
 393     def __patch_applied(self, name):
 394         """Return true if the patch exists in the applied list
 395         """
 396         return name in self.get_applied()
 397
 398     def __patch_unapplied(self, name):
 399         """Return true if the patch exists in the unapplied list
 400         """
 401         return name in self.get_unapplied()
 402
 403     def __begin_stack_check(self):
 404         """Save the current HEAD into .git/refs/heads/base if the stack
 405         is empty
 406         """
 407         if len(self.get_applied()) == 0:
 408             head = git.get_head()
 409             write_string(self.__base_file, head)
 410
 411     def __end_stack_check(self):
 412         """Remove .git/refs/heads/base if the stack is empty.
 413         This warning should never happen
 414         """
 415         if len(self.get_applied()) == 0 \
 416            and read_string(self.__base_file) != git.get_head():
 417             print 'Warning: stack empty but the HEAD and base are different'
 418
 419     def head_top_equal(self):
 420         """Return true if the head and the top are the same
 421         """
 422         crt = self.get_current()
 423         if not crt:
 424             # we don't care, no patches applied
 425             return True
 426         return git.get_head() == Patch(crt, self.__patch_dir,
 427                                        self.__refs_dir).get_top()
 428
 429     def is_initialised(self):
 430         """Checks if series is already initialised
 431         """
 432         return os.path.isdir(self.__patch_dir)
 433
 434     def init(self):
 435         """Initialises the stgit series
 436         """
 437         bases_dir = os.path.join(self.__base_dir, 'refs', 'bases')
 438
 439         if self.is_initialised():
 440             raise StackException, self.__patch_dir + ' already exists'
 441         os.makedirs(self.__patch_dir)
 442
 443         if not os.path.isdir(bases_dir):
 444             os.makedirs(bases_dir)
 445
 446         create_empty_file(self.__applied_file)
 447         create_empty_file(self.__unapplied_file)
 448         create_empty_file(self.__descr_file)
 449         os.makedirs(os.path.join(self.__series_dir, 'patches'))
 450         os.makedirs(self.__refs_dir)
 451         self.__begin_stack_check()
 452
 453     def convert(self):
 454         """Either convert to use a separate patch directory, or
 455         unconvert to place the patches in the same directory with
 456         series control files
 457         """
 458         if self.__patch_dir == self.__series_dir:
 459             print 'Converting old-style to new-style...',
 460             sys.stdout.flush()
 461
 462             self.__patch_dir = os.path.join(self.__series_dir, 'patches')
 463             os.makedirs(self.__patch_dir)
 464
 465             for p in self.get_applied() + self.get_unapplied():
 466                 src = os.path.join(self.__series_dir, p)
 467                 dest = os.path.join(self.__patch_dir, p)
 468                 os.rename(src, dest)
 469
 470             print 'done'
 471
 472         else:
 473             print 'Converting new-style to old-style...',
 474             sys.stdout.flush()
 475
 476             for p in self.get_applied() + self.get_unapplied():
 477                 src = os.path.join(self.__patch_dir, p)
 478                 dest = os.path.join(self.__series_dir, p)
 479                 os.rename(src, dest)
 480
 481             if not os.listdir(self.__patch_dir):
 482                 os.rmdir(self.__patch_dir)
 483                 print 'done'
 484             else:
 485                 print 'Patch directory %s is not empty.' % self.__name
 486
 487             self.__patch_dir = self.__series_dir
 488
 489     def rename(self, to_name):
 490         """Renames a series
 491         """
 492         to_stack = Series(to_name)
 493
 494         if to_stack.is_initialised():
 495             raise StackException, '"%s" already exists' % to_stack.get_branch()
 496         if os.path.exists(to_stack.__base_file):
 497             os.remove(to_stack.__base_file)
 498
 499         git.rename_branch(self.__name, to_name)
 500
 501         if os.path.isdir(self.__series_dir):
 502             os.rename(self.__series_dir, to_stack.__series_dir)
 503         if os.path.exists(self.__base_file):
 504             os.rename(self.__base_file, to_stack.__base_file)
 505
 506         self.__init__(to_name)
 507
 508     def clone(self, target_series):
 509         """Clones a series
 510         """
 511         base = read_string(self.get_base_file())
 512         git.create_branch(target_series, tree_id = base)
 513         Series(target_series).init()
 514         new_series = Series(target_series)
 515
 516         # generate an artificial description file
 517         write_string(new_series.__descr_file, 'clone of "%s"' % self.__name)
 518
 519         # clone self's entire series as unapplied patches
 520         patches = self.get_applied() + self.get_unapplied()
 521         patches.reverse()
 522         for p in patches:
 523             patch = self.get_patch(p)
 524             new_series.new_patch(p, message = patch.get_description(),
 525                                  can_edit = False, unapplied = True,
 526                                  bottom = patch.get_bottom(),
 527                                  top = patch.get_top(),
 528                                  author_name = patch.get_authname(),
 529                                  author_email = patch.get_authemail(),
 530                                  author_date = patch.get_authdate())
 531
 532         # fast forward the cloned series to self's top
 533         new_series.forward_patches(self.get_applied())
 534
 535     def delete(self, force = False):
 536         """Deletes an stgit series
 537         """
 538         if self.is_initialised():
 539             patches = self.get_unapplied() + self.get_applied()
 540             if not force and patches:
 541                 raise StackException, \
 542                       'Cannot delete: the series still contains patches'
 543             for p in patches:
 544                 Patch(p, self.__patch_dir, self.__refs_dir).delete()
 545
 546             if os.path.exists(self.__applied_file):
 547                 os.remove(self.__applied_file)
 548             if os.path.exists(self.__unapplied_file):
 549                 os.remove(self.__unapplied_file)
 550             if os.path.exists(self.__current_file):
 551                 os.remove(self.__current_file)
 552             if os.path.exists(self.__descr_file):
 553                 os.remove(self.__descr_file)
 554             if not os.listdir(self.__patch_dir):
 555                 os.rmdir(self.__patch_dir)
 556             else:
 557                 print 'Patch directory %s is not empty.' % self.__name
 558             if not os.listdir(self.__series_dir):
 559                 os.rmdir(self.__series_dir)
 560             else:
 561                 print 'Series directory %s is not empty.' % self.__name
 562             if not os.listdir(self.__refs_dir):
 563                 os.rmdir(self.__refs_dir)
 564             else:
 565                 print 'Refs directory %s is not empty.' % self.__refs_dir
 566
 567         if os.path.exists(self.__base_file):
 568             os.remove(self.__base_file)
 569
 570     def refresh_patch(self, files = None, message = None, edit = False,
 571                       show_patch = False,
 572                       cache_update = True,
 573                       author_name = None, author_email = None,
 574                       author_date = None,
 575                       committer_name = None, committer_email = None):
 576         """Generates a new commit for the given patch
 577         """
 578         name = self.get_current()
 579         if not name:
 580             raise StackException, 'No patches applied'
 581
 582         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 583
 584         descr = patch.get_description()
 585         if not (message or descr):
 586             edit = True
 587             descr = ''
 588         elif message:
 589             descr = message
 590
 591         if not message and edit:
 592             descr = edit_file(self, descr.rstrip(), \
 593                               'Please edit the description for patch "%s" ' \
 594                               'above.' % name, show_patch)
 595
 596         if not author_name:
 597             author_name = patch.get_authname()
 598         if not author_email:
 599             author_email = patch.get_authemail()
 600         if not author_date:
 601             author_date = patch.get_authdate()
 602         if not committer_name:
 603             committer_name = patch.get_commname()
 604         if not committer_email:
 605             committer_email = patch.get_commemail()
 606
 607         commit_id = git.commit(files = files,
 608                                message = descr, parents = [patch.get_bottom()],
 609                                cache_update = cache_update,
 610                                allowempty = True,
 611                                author_name = author_name,
 612                                author_email = author_email,
 613                                author_date = author_date,
 614                                committer_name = committer_name,
 615                                committer_email = committer_email)
 616
 617         patch.set_top(commit_id)
 618         patch.set_description(descr)
 619         patch.set_authname(author_name)
 620         patch.set_authemail(author_email)
 621         patch.set_authdate(author_date)
 622         patch.set_commname(committer_name)
 623         patch.set_commemail(committer_email)
 624
 625         return commit_id
 626
 627     def new_patch(self, name, message = None, can_edit = True,
 628                   unapplied = False, show_patch = False,
 629                   top = None, bottom = None,
 630                   author_name = None, author_email = None, author_date = None,
 631                   committer_name = None, committer_email = None):
 632         """Creates a new patch
 633         """
 634         if self.__patch_applied(name) or self.__patch_unapplied(name):
 635             raise StackException, 'Patch "%s" already exists' % name
 636
 637         if not message and can_edit:
 638             descr = edit_file(self, None, \
 639                               'Please enter the description for patch "%s" ' \
 640                               'above.' % name, show_patch)
 641         else:
 642             descr = message
 643
 644         head = git.get_head()
 645
 646         self.__begin_stack_check()
 647
 648         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 649         patch.create()
 650
 651         if bottom:
 652             patch.set_bottom(bottom)
 653         else:
 654             patch.set_bottom(head)
 655         if top:
 656             patch.set_top(top)
 657         else:
 658             patch.set_top(head)
 659
 660         patch.set_description(descr)
 661         patch.set_authname(author_name)
 662         patch.set_authemail(author_email)
 663         patch.set_authdate(author_date)
 664         patch.set_commname(committer_name)
 665         patch.set_commemail(committer_email)
 666
 667         if unapplied:
 668             patches = [patch.get_name()] + self.get_unapplied()
 669
 670             f = file(self.__unapplied_file, 'w+')
 671             f.writelines([line + '\n' for line in patches])
 672             f.close()
 673         else:
 674             append_string(self.__applied_file, patch.get_name())
 675             self.__set_current(name)
 676
 677     def delete_patch(self, name):
 678         """Deletes a patch
 679         """
 680         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 681
 682         if self.__patch_is_current(patch):
 683             self.pop_patch(name)
 684         elif self.__patch_applied(name):
 685             raise StackException, 'Cannot remove an applied patch, "%s", ' \
 686                   'which is not current' % name
 687         elif not name in self.get_unapplied():
 688             raise StackException, 'Unknown patch "%s"' % name
 689
 690         patch.delete()
 691
 692         unapplied = self.get_unapplied()
 693         unapplied.remove(name)
 694         f = file(self.__unapplied_file, 'w+')
 695         f.writelines([line + '\n' for line in unapplied])
 696         f.close()
 697
 698     def forward_patches(self, names):
 699         """Try to fast-forward an array of patches.
 700
 701         On return, patches in names[0:returned_value] have been pushed on the
 702         stack. Apply the rest with push_patch
 703         """
 704         unapplied = self.get_unapplied()
 705         self.__begin_stack_check()
 706
 707         forwarded = 0
 708         top = git.get_head()
 709
 710         for name in names:
 711             assert(name in unapplied)
 712
 713             patch = Patch(name, self.__patch_dir, self.__refs_dir)
 714
 715             head = top
 716             bottom = patch.get_bottom()
 717             top = patch.get_top()
 718
 719             # top != bottom always since we have a commit for each patch
 720             if head == bottom:
 721                 # reset the backup information
 722                 patch.set_bottom(head, backup = True)
 723                 patch.set_top(top, backup = True)
 724
 725             else:
 726                 head_tree = git.get_commit(head).get_tree()
 727                 bottom_tree = git.get_commit(bottom).get_tree()
 728                 if head_tree == bottom_tree:
 729                     # We must just reparent this patch and create a new commit
 730                     # for it
 731                     descr = patch.get_description()
 732                     author_name = patch.get_authname()
 733                     author_email = patch.get_authemail()
 734                     author_date = patch.get_authdate()
 735                     committer_name = patch.get_commname()
 736                     committer_email = patch.get_commemail()
 737
 738                     top_tree = git.get_commit(top).get_tree()
 739
 740                     top = git.commit(message = descr, parents = [head],
 741                                      cache_update = False,
 742                                      tree_id = top_tree,
 743                                      allowempty = True,
 744                                      author_name = author_name,
 745                                      author_email = author_email,
 746                                      author_date = author_date,
 747                                      committer_name = committer_name,
 748                                      committer_email = committer_email)
 749
 750                     patch.set_bottom(head, backup = True)
 751                     patch.set_top(top, backup = True)
 752                 else:
 753                     top = head
 754                     # stop the fast-forwarding, must do a real merge
 755                     break
 756
 757             forwarded+=1
 758             unapplied.remove(name)
 759
 760         if forwarded == 0:
 761             return 0
 762
 763         git.switch(top)
 764
 765         append_strings(self.__applied_file, names[0:forwarded])
 766
 767         f = file(self.__unapplied_file, 'w+')
 768         f.writelines([line + '\n' for line in unapplied])
 769         f.close()
 770
 771         self.__set_current(name)
 772
 773         return forwarded
 774
 775     def push_patch(self, name):
 776         """Pushes a patch on the stack
 777         """
 778         unapplied = self.get_unapplied()
 779         assert(name in unapplied)
 780
 781         self.__begin_stack_check()
 782
 783         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 784
 785         head = git.get_head()
 786         bottom = patch.get_bottom()
 787         top = patch.get_top()
 788
 789         ex = None
 790         modified = False
 791
 792         # top != bottom always since we have a commit for each patch
 793         if head == bottom:
 794             # reset the backup information
 795             patch.set_bottom(bottom, backup = True)
 796             patch.set_top(top, backup = True)
 797
 798             git.switch(top)
 799         else:
 800             # new patch needs to be refreshed.
 801             # The current patch is empty after merge.
 802             patch.set_bottom(head, backup = True)
 803             patch.set_top(head, backup = True)
 804
 805             # Try the fast applying first. If this fails, fall back to the
 806             # three-way merge
 807             if not git.apply_diff(bottom, top):
 808                 # if git.apply_diff() fails, the patch requires a diff3
 809                 # merge and can be reported as modified
 810                 modified = True
 811
 812                 # merge can fail but the patch needs to be pushed
 813                 try:
 814                     git.merge(bottom, head, top)
 815                 except git.GitException, ex:
 816                     print >> sys.stderr, \
 817                           'The merge failed during "push". ' \
 818                           'Use "refresh" after fixing the conflicts'
 819
 820         append_string(self.__applied_file, name)
 821
 822         unapplied.remove(name)
 823         f = file(self.__unapplied_file, 'w+')
 824         f.writelines([line + '\n' for line in unapplied])
 825         f.close()
 826
 827         self.__set_current(name)
 828
 829         # head == bottom case doesn't need to refresh the patch
 830         if head != bottom:
 831             if not ex:
 832                 # if the merge was OK and no conflicts, just refresh the patch
 833                 # The GIT cache was already updated by the merge operation
 834                 self.refresh_patch(cache_update = False)
 835             else:
 836                 raise StackException, str(ex)
 837
 838         return modified
 839
 840     def undo_push(self):
 841         name = self.get_current()
 842         assert(name)
 843
 844         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 845         git.reset()
 846         self.pop_patch(name)
 847         return patch.restore_old_boundaries()
 848
 849     def pop_patch(self, name):
 850         """Pops the top patch from the stack
 851         """
 852         applied = self.get_applied()
 853         applied.reverse()
 854         assert(name in applied)
 855
 856         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 857
 858         git.switch(patch.get_bottom())
 859
 860         # save the new applied list
 861         idx = applied.index(name) + 1
 862
 863         popped = applied[:idx]
 864         popped.reverse()
 865         unapplied = popped + self.get_unapplied()
 866
 867         f = file(self.__unapplied_file, 'w+')
 868         f.writelines([line + '\n' for line in unapplied])
 869         f.close()
 870
 871         del applied[:idx]
 872         applied.reverse()
 873
 874         f = file(self.__applied_file, 'w+')
 875         f.writelines([line + '\n' for line in applied])
 876         f.close()
 877
 878         if applied == []:
 879             self.__set_current(None)
 880         else:
 881             self.__set_current(applied[-1])
 882
 883         self.__end_stack_check()
 884
 885     def empty_patch(self, name):
 886         """Returns True if the patch is empty
 887         """
 888         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 889         bottom = patch.get_bottom()
 890         top = patch.get_top()
 891
 892         if bottom == top:
 893             return True
 894         elif git.get_commit(top).get_tree() \
 895                  == git.get_commit(bottom).get_tree():
 896             return True
 897
 898         return False
 899
 900     def rename_patch(self, oldname, newname):
 901         applied = self.get_applied()
 902         unapplied = self.get_unapplied()
 903
 904         if oldname == newname:
 905             raise StackException, '"To" name and "from" name are the same'
 906
 907         if newname in applied or newname in unapplied:
 908             raise StackException, 'Patch "%s" already exists' % newname
 909
 910         if oldname in unapplied:
 911             Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname)
 912             unapplied[unapplied.index(oldname)] = newname
 913
 914             f = file(self.__unapplied_file, 'w+')
 915             f.writelines([line + '\n' for line in unapplied])
 916             f.close()
 917         elif oldname in applied:
 918             Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname)
 919             if oldname == self.get_current():
 920                 self.__set_current(newname)
 921
 922             applied[applied.index(oldname)] = newname
 923
 924             f = file(self.__applied_file, 'w+')
 925             f.writelines([line + '\n' for line in applied])
 926             f.close()
 927         else:
 928             raise StackException, 'Unknown patch "%s"' % oldname