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

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