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

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