chiark - git - mdw - 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, string, comment, show_patch = True):
  68     fname = '.stgit.msg'
  69     tmpl = os.path.join(git.base_dir, 'patchdescr.tmpl')
  70
  71     f = file(fname, 'w+')
  72     if string:
  73         print >> f, string
  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:'
  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     string = f.read()
 112
 113     f.close()
 114     os.remove(fname)
 115
 116     return string
 117
 118 #
 119 # Classes
 120 #
 121
 122 class Patch:
 123     """Basic patch implementation
 124     """
 125     def __init__(self, name, patch_dir):
 126         self.__patch_dir = patch_dir
 127         self.__name = name
 128         self.__dir = os.path.join(self.__patch_dir, self.__name)
 129
 130     def create(self):
 131         os.mkdir(self.__dir)
 132         create_empty_file(os.path.join(self.__dir, 'bottom'))
 133         create_empty_file(os.path.join(self.__dir, 'top'))
 134
 135     def delete(self):
 136         for f in os.listdir(self.__dir):
 137             os.remove(os.path.join(self.__dir, f))
 138         os.rmdir(self.__dir)
 139
 140     def get_name(self):
 141         return self.__name
 142
 143     def rename(self, newname):
 144         olddir = self.__dir
 145         self.__name = newname
 146         self.__dir = os.path.join(self.__patch_dir, self.__name)
 147
 148         os.rename(olddir, self.__dir)
 149
 150     def __get_field(self, name, multiline = False):
 151         id_file = os.path.join(self.__dir, name)
 152         if os.path.isfile(id_file):
 153             string = read_string(id_file, multiline)
 154             if string == '':
 155                 return None
 156             else:
 157                 return string
 158         else:
 159             return None
 160
 161     def __set_field(self, name, string, multiline = False):
 162         fname = os.path.join(self.__dir, name)
 163         if string and string != '':
 164             write_string(fname, string, multiline)
 165         elif os.path.isfile(fname):
 166             os.remove(fname)
 167
 168     def get_bottom(self):
 169         return self.__get_field('bottom')
 170
 171     def set_bottom(self, string, backup = False):
 172         if backup:
 173             curr = self.__get_field('bottom')
 174             if curr != string:
 175                 self.__set_field('bottom.old', curr)
 176             else:
 177                 self.__set_field('bottom.old', None)
 178         self.__set_field('bottom', string)
 179
 180     def get_top(self):
 181         return self.__get_field('top')
 182
 183     def set_top(self, string, backup = False):
 184         if backup:
 185             curr = self.__get_field('top')
 186             if curr != string:
 187                 self.__set_field('top.old', curr)
 188             else:
 189                 self.__set_field('top.old', None)
 190         self.__set_field('top', string)
 191
 192     def restore_old_boundaries(self):
 193         bottom = self.__get_field('bottom.old')
 194         top = self.__get_field('top.old')
 195
 196         if top and bottom:
 197             self.__set_field('bottom', bottom)
 198             self.__set_field('top', top)
 199             return True
 200         else:
 201             return False
 202
 203     def get_description(self):
 204         return self.__get_field('description', True)
 205
 206     def set_description(self, string):
 207         self.__set_field('description', string, True)
 208
 209     def get_authname(self):
 210         return self.__get_field('authname')
 211
 212     def set_authname(self, string):
 213         if not string and config.has_option('stgit', 'authname'):
 214             string = config.get('stgit', 'authname')
 215         self.__set_field('authname', string)
 216
 217     def get_authemail(self):
 218         return self.__get_field('authemail')
 219
 220     def set_authemail(self, string):
 221         if not string and config.has_option('stgit', 'authemail'):
 222             string = config.get('stgit', 'authemail')
 223         self.__set_field('authemail', string)
 224
 225     def get_authdate(self):
 226         return self.__get_field('authdate')
 227
 228     def set_authdate(self, string):
 229         self.__set_field('authdate', string)
 230
 231     def get_commname(self):
 232         return self.__get_field('commname')
 233
 234     def set_commname(self, string):
 235         if not string and config.has_option('stgit', 'commname'):
 236             string = config.get('stgit', 'commname')
 237         self.__set_field('commname', string)
 238
 239     def get_commemail(self):
 240         return self.__get_field('commemail')
 241
 242     def set_commemail(self, string):
 243         if not string and config.has_option('stgit', 'commemail'):
 244             string = config.get('stgit', 'commemail')
 245         self.__set_field('commemail', string)
 246
 247
 248 class Series:
 249     """Class including the operations on series
 250     """
 251     def __init__(self, name = None):
 252         """Takes a series name as the parameter.
 253         """
 254         if name:
 255             self.__name = name
 256         else:
 257             self.__name = git.get_head_file()
 258
 259         if self.__name:
 260             self.__patch_dir = os.path.join(git.base_dir, 'patches',
 261                                             self.__name)
 262             self.__base_file = os.path.join(git.base_dir, 'refs', 'bases',
 263                                             self.__name)
 264             self.__applied_file = os.path.join(self.__patch_dir, 'applied')
 265             self.__unapplied_file = os.path.join(self.__patch_dir, 'unapplied')
 266             self.__current_file = os.path.join(self.__patch_dir, 'current')
 267
 268     def get_branch(self):
 269         """Return the branch name for the Series object
 270         """
 271         return self.__name
 272
 273     def __set_current(self, name):
 274         """Sets the topmost patch
 275         """
 276         if name:
 277             write_string(self.__current_file, name)
 278         else:
 279             create_empty_file(self.__current_file)
 280
 281     def get_patch(self, name):
 282         """Return a Patch object for the given name
 283         """
 284         return Patch(name, self.__patch_dir)
 285
 286     def get_current(self):
 287         """Return a Patch object representing the topmost patch
 288         """
 289         if os.path.isfile(self.__current_file):
 290             name = read_string(self.__current_file)
 291         else:
 292             return None
 293         if name == '':
 294             return None
 295         else:
 296             return name
 297
 298     def get_applied(self):
 299         if not os.path.isfile(self.__applied_file):
 300             raise StackException, 'Branch "%s" not initialised' % self.__name
 301         f = file(self.__applied_file)
 302         names = [line.strip() for line in f.readlines()]
 303         f.close()
 304         return names
 305
 306     def get_unapplied(self):
 307         if not os.path.isfile(self.__unapplied_file):
 308             raise StackException, 'Branch "%s" not initialised' % self.__name
 309         f = file(self.__unapplied_file)
 310         names = [line.strip() for line in f.readlines()]
 311         f.close()
 312         return names
 313
 314     def get_base_file(self):
 315         return self.__base_file
 316
 317     def __patch_is_current(self, patch):
 318         return patch.get_name() == read_string(self.__current_file)
 319
 320     def __patch_applied(self, name):
 321         """Return true if the patch exists in the applied list
 322         """
 323         return name in self.get_applied()
 324
 325     def __patch_unapplied(self, name):
 326         """Return true if the patch exists in the unapplied list
 327         """
 328         return name in self.get_unapplied()
 329
 330     def __begin_stack_check(self):
 331         """Save the current HEAD into .git/refs/heads/base if the stack
 332         is empty
 333         """
 334         if len(self.get_applied()) == 0:
 335             head = git.get_head()
 336             write_string(self.__base_file, head)
 337
 338     def __end_stack_check(self):
 339         """Remove .git/refs/heads/base if the stack is empty.
 340         This warning should never happen
 341         """
 342         if len(self.get_applied()) == 0 \
 343            and read_string(self.__base_file) != git.get_head():
 344             print 'Warning: stack empty but the HEAD and base are different'
 345
 346     def head_top_equal(self):
 347         """Return true if the head and the top are the same
 348         """
 349         crt = self.get_current()
 350         if not crt:
 351             # we don't care, no patches applied
 352             return True
 353         return git.get_head() == Patch(crt, self.__patch_dir).get_top()
 354
 355     def init(self):
 356         """Initialises the stgit series
 357         """
 358         bases_dir = os.path.join(git.base_dir, 'refs', 'bases')
 359
 360         if os.path.isdir(self.__patch_dir):
 361             raise StackException, self.__patch_dir + ' already exists'
 362         os.makedirs(self.__patch_dir)
 363
 364         if not os.path.isdir(bases_dir):
 365             os.makedirs(bases_dir)
 366
 367         create_empty_file(self.__applied_file)
 368         create_empty_file(self.__unapplied_file)
 369         self.__begin_stack_check()
 370
 371     def refresh_patch(self, message = None, edit = False, show_patch = False,
 372                       cache_update = True,
 373                       author_name = None, author_email = None,
 374                       author_date = None,
 375                       committer_name = None, committer_email = None):
 376         """Generates a new commit for the given patch
 377         """
 378         name = self.get_current()
 379         if not name:
 380             raise StackException, 'No patches applied'
 381
 382         patch = Patch(name, self.__patch_dir)
 383
 384         descr = patch.get_description()
 385         if not (message or descr):
 386             edit = True
 387             descr = ''
 388         elif message:
 389             descr = message
 390
 391         if not message and edit:
 392             descr = edit_file(self, descr.rstrip(), \
 393                               'Please edit the description for patch "%s" ' \
 394                               'above.' % name, show_patch)
 395
 396         if not author_name:
 397             author_name = patch.get_authname()
 398         if not author_email:
 399             author_email = patch.get_authemail()
 400         if not author_date:
 401             author_date = patch.get_authdate()
 402         if not committer_name:
 403             committer_name = patch.get_commname()
 404         if not committer_email:
 405             committer_email = patch.get_commemail()
 406
 407         commit_id = git.commit(message = descr, parents = [patch.get_bottom()],
 408                                cache_update = cache_update,
 409                                allowempty = True,
 410                                author_name = author_name,
 411                                author_email = author_email,
 412                                author_date = author_date,
 413                                committer_name = committer_name,
 414                                committer_email = committer_email)
 415
 416         patch.set_top(commit_id)
 417         patch.set_description(descr)
 418         patch.set_authname(author_name)
 419         patch.set_authemail(author_email)
 420         patch.set_authdate(author_date)
 421         patch.set_commname(committer_name)
 422         patch.set_commemail(committer_email)
 423
 424         return commit_id
 425
 426     def new_patch(self, name, message = None, can_edit = True,
 427                   unapplied = False, show_patch = False,
 428                   top = None, bottom = None,
 429                   author_name = None, author_email = None, author_date = None,
 430                   committer_name = None, committer_email = None):
 431         """Creates a new patch
 432         """
 433         if self.__patch_applied(name) or self.__patch_unapplied(name):
 434             raise StackException, 'Patch "%s" already exists' % name
 435
 436         if not message and can_edit:
 437             descr = edit_file(self, None, \
 438                               'Please enter the description for patch "%s" ' \
 439                               'above.' % name, show_patch)
 440         else:
 441             descr = message
 442
 443         head = git.get_head()
 444
 445         self.__begin_stack_check()
 446
 447         patch = Patch(name, self.__patch_dir)
 448         patch.create()
 449
 450         if bottom:
 451             patch.set_bottom(bottom)
 452         else:
 453             patch.set_bottom(head)
 454         if top:
 455             patch.set_top(top)
 456         else:
 457             patch.set_top(head)
 458
 459         patch.set_description(descr)
 460         patch.set_authname(author_name)
 461         patch.set_authemail(author_email)
 462         patch.set_authdate(author_date)
 463         patch.set_commname(committer_name)
 464         patch.set_commemail(committer_email)
 465
 466         if unapplied:
 467             patches = [patch.get_name()] + self.get_unapplied()
 468
 469             f = file(self.__unapplied_file, 'w+')
 470             f.writelines([line + '\n' for line in patches])
 471             f.close()
 472         else:
 473             append_string(self.__applied_file, patch.get_name())
 474             self.__set_current(name)
 475
 476     def delete_patch(self, name):
 477         """Deletes a patch
 478         """
 479         patch = Patch(name, self.__patch_dir)
 480
 481         if self.__patch_is_current(patch):
 482             self.pop_patch(name)
 483         elif self.__patch_applied(name):
 484             raise StackException, 'Cannot remove an applied patch, "%s", ' \
 485                   'which is not current' % name
 486         elif not name in self.get_unapplied():
 487             raise StackException, 'Unknown patch "%s"' % name
 488
 489         patch.delete()
 490
 491         unapplied = self.get_unapplied()
 492         unapplied.remove(name)
 493         f = file(self.__unapplied_file, 'w+')
 494         f.writelines([line + '\n' for line in unapplied])
 495         f.close()
 496
 497     def forward_patches(self, names):
 498         """Try to fast-forward an array of patches.
 499
 500         On return, patches in names[0:returned_value] have been pushed on the
 501         stack. Apply the rest with push_patch
 502         """
 503         unapplied = self.get_unapplied()
 504         self.__begin_stack_check()
 505
 506         forwarded = 0
 507         top = git.get_head()
 508
 509         for name in names:
 510             assert(name in unapplied)
 511
 512             patch = Patch(name, self.__patch_dir)
 513
 514             head = top
 515             bottom = patch.get_bottom()
 516             top = patch.get_top()
 517
 518             # top != bottom always since we have a commit for each patch
 519             if head == bottom:
 520                 # reset the backup information
 521                 patch.set_bottom(head, backup = True)
 522                 patch.set_top(top, backup = True)
 523
 524             else:
 525                 head_tree = git.get_commit(head).get_tree()
 526                 bottom_tree = git.get_commit(bottom).get_tree()
 527                 if head_tree == bottom_tree:
 528                     # We must just reparent this patch and create a new commit
 529                     # for it
 530                     descr = patch.get_description()
 531                     author_name = patch.get_authname()
 532                     author_email = patch.get_authemail()
 533                     author_date = patch.get_authdate()
 534                     committer_name = patch.get_commname()
 535                     committer_email = patch.get_commemail()
 536
 537                     top_tree = git.get_commit(top).get_tree()
 538
 539                     top = git.commit(message = descr, parents = [head],
 540                                      cache_update = False,
 541                                      tree_id = top_tree,
 542                                      allowempty = True,
 543                                      author_name = author_name,
 544                                      author_email = author_email,
 545                                      author_date = author_date,
 546                                      committer_name = committer_name,
 547                                      committer_email = committer_email)
 548
 549                     patch.set_bottom(head, backup = True)
 550                     patch.set_top(top, backup = True)
 551                 else:
 552                     top = head
 553                     # stop the fast-forwarding, must do a real merge
 554                     break
 555
 556             forwarded+=1
 557             unapplied.remove(name)
 558
 559         git.switch(top)
 560
 561         append_strings(self.__applied_file, names[0:forwarded])
 562
 563         f = file(self.__unapplied_file, 'w+')
 564         f.writelines([line + '\n' for line in unapplied])
 565         f.close()
 566
 567         self.__set_current(name)
 568
 569         return forwarded
 570
 571     def push_patch(self, name):
 572         """Pushes a patch on the stack
 573         """
 574         unapplied = self.get_unapplied()
 575         assert(name in unapplied)
 576
 577         self.__begin_stack_check()
 578
 579         patch = Patch(name, self.__patch_dir)
 580
 581         head = git.get_head()
 582         bottom = patch.get_bottom()
 583         top = patch.get_top()
 584
 585         ex = None
 586
 587         # top != bottom always since we have a commit for each patch
 588         if head == bottom:
 589             # reset the backup information
 590             patch.set_bottom(bottom, backup = True)
 591             patch.set_top(top, backup = True)
 592
 593             git.switch(top)
 594         else:
 595             # new patch needs to be refreshed.
 596             # The current patch is empty after merge.
 597             patch.set_bottom(head, backup = True)
 598             patch.set_top(head, backup = True)
 599
 600             # Try the fast applying first. If this fails, fall back to the
 601             # three-way merge
 602             if not git.apply_diff(bottom, top):
 603                 # merge can fail but the patch needs to be pushed
 604                 try:
 605                     git.merge(bottom, head, top)
 606                 except git.GitException, ex:
 607                     print >> sys.stderr, \
 608                           'The merge failed during "push". ' \
 609                           'Use "refresh" after fixing the conflicts'
 610
 611         append_string(self.__applied_file, name)
 612
 613         unapplied.remove(name)
 614         f = file(self.__unapplied_file, 'w+')
 615         f.writelines([line + '\n' for line in unapplied])
 616         f.close()
 617
 618         self.__set_current(name)
 619
 620         # head == bottom case doesn't need to refresh the patch
 621         if head != bottom:
 622             if not ex:
 623                 # if the merge was OK and no conflicts, just refresh the patch
 624                 # The GIT cache was already updated by the merge operation
 625                 self.refresh_patch(cache_update = False)
 626             else:
 627                 raise StackException, str(ex)
 628
 629     def undo_push(self):
 630         name = self.get_current()
 631         assert(name)
 632
 633         patch = Patch(name, self.__patch_dir)
 634         git.reset()
 635         self.pop_patch(name)
 636         return patch.restore_old_boundaries()
 637
 638     def pop_patch(self, name):
 639         """Pops the top patch from the stack
 640         """
 641         applied = self.get_applied()
 642         applied.reverse()
 643         assert(name in applied)
 644
 645         patch = Patch(name, self.__patch_dir)
 646
 647         git.switch(patch.get_bottom())
 648
 649         # save the new applied list
 650         idx = applied.index(name) + 1
 651
 652         popped = applied[:idx]
 653         popped.reverse()
 654         unapplied = popped + self.get_unapplied()
 655
 656         f = file(self.__unapplied_file, 'w+')
 657         f.writelines([line + '\n' for line in unapplied])
 658         f.close()
 659
 660         del applied[:idx]
 661         applied.reverse()
 662
 663         f = file(self.__applied_file, 'w+')
 664         f.writelines([line + '\n' for line in applied])
 665         f.close()
 666
 667         if applied == []:
 668             self.__set_current(None)
 669         else:
 670             self.__set_current(applied[-1])
 671
 672         self.__end_stack_check()
 673
 674     def empty_patch(self, name):
 675         """Returns True if the patch is empty
 676         """
 677         patch = Patch(name, self.__patch_dir)
 678         bottom = patch.get_bottom()
 679         top = patch.get_top()
 680
 681         if bottom == top:
 682             return True
 683         elif git.get_commit(top).get_tree() \
 684                  == git.get_commit(bottom).get_tree():
 685             return True
 686
 687         return False
 688
 689     def rename_patch(self, oldname, newname):
 690         applied = self.get_applied()
 691         unapplied = self.get_unapplied()
 692
 693         if newname in applied or newname in unapplied:
 694             raise StackException, 'Patch "%s" already exists' % newname
 695
 696         if oldname in unapplied:
 697             Patch(oldname, self.__patch_dir).rename(newname)
 698             unapplied[unapplied.index(oldname)] = newname
 699
 700             f = file(self.__unapplied_file, 'w+')
 701             f.writelines([line + '\n' for line in unapplied])
 702             f.close()
 703         elif oldname in applied:
 704             Patch(oldname, self.__patch_dir).rename(newname)
 705             if oldname == self.get_current():
 706                 self.__set_current(newname)
 707
 708             applied[applied.index(oldname)] = newname
 709
 710             f = file(self.__applied_file, 'w+')
 711             f.writelines([line + '\n' for line in applied])
 712             f.close()
 713         else:
 714             raise StackException, 'Unknown patch "%s"' % oldname