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

   1 2005-07-09  Catalin Marinas  <catalin.marinas@gmail.com>
   2
   3         * Release 0.4
   4
   5 2005-07-09  Peter Osterlund <petero2@telia.com>
   6
   7         * Fix spelling errors
   8
   9 2005-07-08  Catalin Marinas  <catalin.marinas@gmail.com>
  10
  11         * stgit/main.py (diff): Add '--stat' option to 'diff'
  12         (files): 'files' command implemented
  13
  14 2005-07-08  Peter Osterlund <petero2@telia.com>
  15
  16         * stgit/git.py (diffstat): %(diffstat)s variable support in the
  17         patch export template
  18
  19 2005-07-07  Catalin Marinas  <catalin.marinas@gmail.com>
  20
  21         * stgit/main.py (resolved): Implemented a 'resolved' command to
  22         mark conflicts as solved. The 'status' command now shows the
  23         conflicts as well. 'refresh' fails if there are conflicts
  24
  25 2005-07-06  Catalin Marinas  <catalin.marinas@gmail.com>
  26
  27         * stgit/stack.py (edit_file): Added support for patchdescr.tmpl
  28
  29         * stgit/main.py (export): Added support for more variables in the
  30         patchexport.tmpl file
  31
  32         * stgit/stack.py (Patch): Add support for author/comitter default
  33         details configuration
  34
  35         * stgit/main.py (push): '--undo' option added to push. This option
  36         allows one to undo the last push operation and restores the old
  37         boundaries of the patch (prior to the push operation)
  38         (pop): pop optimised to switch directly to the last patch to be
  39         popped
  40
  41 2005-07-05  Catalin Marinas  <catalin.marinas@gmail.com>
  42
  43         * stgit/main.py (pop): add '--to' option to 'pop'
  44         (push): add '--to' and '--reverse' options to 'push'
  45
  46         * gitmergeonefile.py: Added support for 'keeporig' option which
  47         selects whether to delete or not the original files after a failed
  48         merge
  49
  50 2005-07-04  Catalin Marinas  <catalin.marinas@gmail.com>
  51
  52         * Add support for configurable merge tool via stgitrc
  53
  54         * Add support for configuration file (/etc/stgitrc, ~/.stgitrc,
  55         .git/stgitrc)
  56
  57 2005-07-02  Catalin Marinas  <catalin.marinas@gmail.com>
  58
  59         * stgit/main.py (export): Added support for the patch description
  60         template. At the moment, only the '%(description)s' variable is
  61         supported
  62
  63 2005-07-01  Catalin Marinas  <catalin.marinas@gmail.com>
  64
  65         * stgit/main.py (refresh): Now it also checks for head != top
  66         (export): Add the patch description to the exported patch files
  67
  68 2005-06-30  Catalin Marinas  <catalin.marinas@gmail.com>
  69
  70         * Fix exception reporting when the .git/HEAD link is not valid
  71
  72         * Empty patches are now marked
  73
  74 2005-06-28  Catalin Marinas  <catalin.marinas@gmail.com>
  75
  76         * Release 0.3
  77
  78         * stgit/stack.py (Series.push_patch): if the merge with the new
  79         base failed, inform the user that "refresh" should be run after
  80         fixing the conflicts
  81
  82         * stgit/main.py (new): checks for local changes and head != top
  83         added
  84
  85         * StGIT is now closer to Quilt in functionality. The 'commit'
  86         command was removed ('refresh' is used instead).
  87
  88 2005-06-25  Catalin Marinas  <catalin.marinas@gmail.com>
  89
  90         * stack.py modified to include all the series functions the Series
  91         class
  92
  93 2005-06-24  Catalin Marinas  <catalin.marinas@gmail.com>
  94
  95         * stgit/git.py (commit): commit tells before invoking the editor
  96         and shows the return error code but without exiting if it is
  97         non-zero
  98
  99 2005-06-23  Catalin Marinas  <catalin.marinas@gmail.com>
 100
 101         * stgit/main.py (push): --number option added to push
 102         (pop): --number option added to push
 103
 104 2005-06-22  Catalin Marinas  <catalin.marinas@gmail.com>
 105
 106         * gitmergeonefile.py: temporary files are placed in <path>.local,
 107         <path>.older and <path>.remote and only removed if the merge
 108         succeeded
 109
 110 2005-06-21  Catalin Marinas  <catalin.marinas@gmail.com>
 111
 112         * stgit/main.py (delete): 'delete' now requires the explicit patch
 113         name as a safety measure
 114
 115         * stgit/stack.py (pop_patch): sys.stdout.flush() added after the
 116         first print
 117         (push_patch): fix bug with 'push' not warning for empty patches
 118
 119         * stgit/stack.py (push_patch): sys.stdout.flush() added after the
 120         first print
 121
 122 2005-06-20  Catalin Marinas  <catalin.marinas@gmail.com>
 123
 124         * Release 0.2
 125
 126         * stgit/stack.py (delete_patch): bug when deleting the topmost
 127         patch fixed
 128
 129         * top/bottom files are backed up to top.old/bottom.old
 130         automatically. The 'diff' command supports them as well
 131
 132         * stg-upgrade.sh: upgrades the .git structure from stgit-0.1 to
 133         stgit-0.2
 134
 135 2005-06-19  Catalin Marinas  <catalin.marinas@gmail.com>
 136
 137         * Multiple heads and bases are now supported. A different series
 138         is available for each head
 139
 140         * gitmergeonefile.py: fix bug caused by not updating the cache
 141         when merging with diff3
 142
 143         * stgit/stack.py: 'push' command reports a warning if the patch is
 144         empty
 145
 146         * stgit/git.py: commit supports an 'allowempty' parameter
 147
 148         * os.path.join() used instead '+' for concatenating path names
 149
 150 2005-06-15  Catalin Marinas  <catalin.marinas@gmail.com>
 151
 152         * Release 0.1
 153