aboutsummaryrefslogtreecommitdiff
path: root/etc/committer.scm.in
blob: ebe6b96bccdffbb5b8038a0d3d4d781815ec6568 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
#!@GUILE@ \
--no-auto-compile -s
!#

;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:

;; This script stages and commits changes to package definitions.

;;; Code:

(import (sxml xpath)
        (srfi srfi-1)
        (srfi srfi-9)
        (ice-9 format)
        (ice-9 popen)
        (ice-9 match)
        (ice-9 rdelim)
        (ice-9 textual-ports))

(define (read-excursion port)
  "Read an expression from PORT and reset the port position before returning
the expression."
  (let ((start (ftell port))
        (result (read port)))
    (seek port start SEEK_SET)
    result))

(define (surrounding-sexp port line-no)
  "Return the top-level S-expression surrounding the change at line number
LINE-NO in PORT."
  (let loop ((i (1- line-no))
             (last-top-level-sexp #f))
    (if (zero? i)
        last-top-level-sexp
        (match (peek-char port)
          (#\(
           (let ((sexp (read-excursion port)))
             (read-line port)
             (loop (1- i) sexp)))
          (_
           (read-line port)
           (loop (1- i) last-top-level-sexp))))))

(define-record-type <hunk>
  (make-hunk file-name
             old-line-number
             new-line-number
             diff)
  hunk?
  (file-name       hunk-file-name)
  ;; Line number before the change
  (old-line-number hunk-old-line-number)
  ;; Line number after the change
  (new-line-number hunk-new-line-number)
  ;; The full diff to be used with "git apply --cached"
  (diff hunk-diff))

(define* (hunk->patch hunk #:optional (port (current-output-port)))
  (let ((file-name (hunk-file-name hunk)))
    (format port
            "diff --git a/~a b/~a~%--- a/~a~%+++ b/~a~%~a"
            file-name file-name file-name file-name
            (hunk-diff hunk))))

(define (diff-info)
  "Read the diff and return a list of <hunk> values."
  (let ((port (open-pipe* OPEN_READ
                          "git" "diff"
                          "--no-prefix"
                          ;; Do not include any context lines.  This makes it
                          ;; easier to find the S-expression surrounding the
                          ;; change.
                          "--unified=0")))
    (define (extract-line-number line-tag)
      (abs (string->number
            (car (string-split line-tag #\,)))))
    (define (read-hunk)
      (reverse
       (let loop ((lines '()))
         (let ((line (read-line port 'concat)))
           (cond
            ((eof-object? line) lines)
            ((or (string-prefix? "@@ " line)
                 (string-prefix? "diff --git" line))
             (unget-string port line)
             lines)
            (else (loop (cons line lines))))))))
    (define info
      (let loop ((acc '())
                 (file-name #f))
        (let ((line (read-line port)))
          (cond
           ((eof-object? line) acc)
           ((string-prefix? "--- " line)
            (match (string-split line #\space)
              ((_ file-name)
               (loop acc file-name))))
           ((string-prefix? "@@ " line)
            (match (string-split line #\space)
              ((_ old-start new-start . _)
               (loop (cons (make-hunk file-name
                                      (extract-line-number old-start)
                                      (extract-line-number new-start)
                                      (string-join (cons* line "\n"
                                                          (read-hunk)) ""))
                           acc)
                     file-name))))
           (else (loop acc file-name))))))
    (close-pipe port)
    info))

(define (old-sexp hunk)
  "Using the diff information in HUNK return the unmodified S-expression
corresponding to the top-level definition containing the staged changes."
  ;; TODO: We can't seek with a pipe port...
  (let* ((port (open-pipe* OPEN_READ
                           "git" "show" (string-append "HEAD:"
                                                       (hunk-file-name hunk))))
         (contents (get-string-all port)))
    (close-pipe port)
    (call-with-input-string contents
      (lambda (port)
        (surrounding-sexp port (hunk-old-line-number hunk))))))

(define (new-sexp hunk)
  "Using the diff information in HUNK return the modified S-expression
corresponding to the top-level definition containing the staged changes."
  (call-with-input-file (hunk-file-name hunk)
    (lambda (port)
      (surrounding-sexp port
                        (hunk-new-line-number hunk)))))

(define* (commit-message file-name old new #:optional (port (current-output-port)))
  "Print ChangeLog commit message for changes between OLD and NEW."
  (define (get-values expr field)
    (match ((sxpath `(// ,field quasiquote *)) expr)
      (() '())
      ((first . rest)
       (map cadadr first))))
  (define (listify items)
    (match items
      ((one) one)
      ((one two)
       (string-append one " and " two))
      ((one two . more)
       (string-append (string-join (drop-right items 1) ", ")
                      ", and " (first (take-right items 1))))))
  (define variable-name
    (second old))
  (define version
    (and=> ((sxpath '(// version *any*)) new)
           first))
  (format port
          "gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%"
          variable-name version file-name variable-name version)
  (for-each (lambda (field)
              (let ((old-values (get-values old field))
                    (new-values (get-values new field)))
                (or (equal? old-values new-values)
                    (let ((removed (lset-difference equal? old-values new-values))
                          (added (lset-difference equal? new-values old-values)))
                      (format port
                              "[~a]: ~a~%" field
                              (match (list (map symbol->string removed)
                                           (map symbol->string added))
                                ((() added)
                                 (format #f "Add ~a."
                                         (listify added)))
                                ((removed ())
                                 (format #f "Remove ~a."
                                         (listify removed)))
                                ((removed added)
                                 (format #f "Remove ~a; add ~a."
                                         (listify removed)
                                         (listify added)))))))))
            '(inputs propagated-inputs native-inputs)))

(define (group-hunks-by-sexp hunks)
  "Return a list of pairs associating all hunks with the S-expression they are
modifying."
  (fold (lambda (sexp hunk acc)
          (match acc
            (((previous-sexp . hunks) . rest)
             (if (equal? sexp previous-sexp)
                 (cons (cons previous-sexp
                             (cons hunk hunks))
                       rest)
                 (cons (cons sexp (list hunk))
                       acc)))
            (_
             (cons (cons sexp (list hunk))
                   acc))))
        '()
        (map new-sexp hunks)
        hunks))

(define (new+old+hunks hunks)
  (map (match-lambda
         ((new . hunks)
          (cons* new (old-sexp (first hunks)) hunks)))
       (group-hunks-by-sexp hunks)))

(define (main . args)
  (match (diff-info)
    (()
     (display "Nothing to be done." (current-error-port)))
    (hunks
     (for-each (match-lambda
                 ((new old . hunks)
                  (for-each (lambda (hunk)
                                (let ((port (open-pipe* OPEN_WRITE
                                                        "git" "apply"
                                                        "--cached"
                                                        "--unidiff-zero")))
                                  (hunk->patch hunk port)
                                  (unless (eqv? 0 (status:exit-val (close-pipe port)))
                                    (error "Cannot apply")))
                                (sleep 1))
                              hunks)
                    (commit-message (hunk-file-name (first hunks))
                                    old new
                                    (current-output-port))
                    (let ((port (open-pipe* OPEN_WRITE "git" "commit" "-F" "-")))
                      (commit-message (hunk-file-name (first hunks))
                                      old new
                                      port)
                      (sleep 1)
                      (unless (eqv? 0 (status:exit-val (close-pipe port)))
                        (error "Cannot commit")))))
               (new+old+hunks hunks)))))

(main)
tic char str[256]; std::string format(fmt), subformat, text; - unsigned int oloc = 0; - unsigned int nloc = 0; + std::string::size_type oloc = 0; + std::string::size_type nloc = 0; kStringReplaceTabs(format); @@ -260,7 +260,7 @@ // -------------------------------------------------------------------------------------------------------- bool kStringHasSuffix ( const std::string & str, const std::string & suffix ) { - unsigned int result = str.rfind(suffix); + std::string::size_type result = str.rfind(suffix); if (result == std::string::npos) return false; return (result == str.size()-suffix.size()); } --- a/kodilib/src/tools/KXMLTools.cpp +++ b/kodilib/src/tools/KXMLTools.cpp @@ -58,11 +58,11 @@ std::string kXMLParseToTagsInVector ( std::string & xml, const std::vector<std::string> & tags ) { std::string open("<"); - unsigned int minLoc = std::string::npos; + std::string::size_type minLoc = std::string::npos; std::vector<std::string>::const_iterator iter = tags.begin(); while (iter != tags.end()) { - unsigned int loc = xml.find(open+(*iter)); + std::string::size_type loc = xml.find(open+(*iter)); if (loc < minLoc) minLoc = loc; iter++; } @@ -77,7 +77,7 @@ std::string value; std::string nameStr(name); nameStr += "='"; - unsigned int loc = xml.find(nameStr); + std::string::size_type loc = xml.find(nameStr); if (loc != std::string::npos) { loc += nameStr.size(); @@ -90,7 +90,7 @@ // -------------------------------------------------------------------------------------------------------- bool kXMLParseNamedCloseTag ( std::string & xml, const std::string & name, bool printError ) { - unsigned int loc = xml.find('<'); + std::string::size_type loc = xml.find('<'); if (loc == std::string::npos) { if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing close tag '%s'", @@ -117,7 +117,7 @@ // -------------------------------------------------------------------------------------------------------- bool kXMLReadNamedOpenTag ( const std::string & xml, const std::string & name, std::string * attributes ) { - unsigned int loc = xml.find('<'), endloc; + std::string::size_type loc = xml.find('<'), endloc; if (loc == std::string::npos || xml[loc+1] == '/') return false; @@ -140,7 +140,7 @@ // -------------------------------------------------------------------------------------------------------- std::string kXMLParseNamedOpenTag ( std::string & xml, const std::string & name, std::string * attributes, bool printError ) { - unsigned int loc = xml.find('<'); + std::string::size_type loc = xml.find('<'); if (loc == std::string::npos || xml[loc+1] == '/') { if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing tag '%s'", name.c_str())); @@ -191,7 +191,7 @@ // -------------------------------------------------------------------------------------------------------- bool kXMLParseOpenTag ( std::string & xml, std::string & name, std::string * attributes, bool printError ) { - unsigned int loc = xml.find('<'); + std::string::size_type loc = xml.find('<'); if (loc == std::string::npos || xml[loc+1] == '/') { if (printError) KConsole::printError("invalid XML:\nmissing open tag"); @@ -295,7 +295,7 @@ // -------------------------------------------------------------------------------------------------------- bool kXMLParseValue( std::string & xml, const std::string & name, int type, void * value, bool printError ) { - unsigned int loc = xml.find('<'); + std::string::size_type loc = xml.find('<'); if (loc == std::string::npos || xml[loc+1] == '/') { if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing value '%s'", name.c_str())); @@ -379,8 +379,8 @@ } else if (typeString == "string") { - unsigned int first = substring.find("\"")+1; - unsigned int last = substring.rfind("\"", std::string::npos); + std::string::size_type first = substring.find("\"")+1; + std::string::size_type last = substring.rfind("\"", std::string::npos); *((std::string*)value) = substring.substr(first, last-first); } --- a/kodilib/src/types/KKey.cpp +++ b/kodilib/src/types/KKey.cpp @@ -31,7 +31,7 @@ // -------------------------------------------------------------------------------------------------------- std::string KKey::getUnmodifiedName () const { - unsigned int keyPos = name.find('_', 0); + std::string::size_type keyPos = name.find('_', 0); if (keyPos == std::string::npos) { return name; @@ -42,7 +42,7 @@ // -------------------------------------------------------------------------------------------------------- std::string KKey::getModifierName () const { - unsigned int keyPos = name.find('_', 0); + std::string::size_type keyPos = name.find('_', 0); if (keyPos == std::string::npos) { return ""; --- a/kodilib/src/widgets/KFileNameField.cpp +++ b/kodilib/src/widgets/KFileNameField.cpp @@ -41,7 +41,7 @@ std::string restPath; // path behind cursor // map cropped path to current directory and rest path to file prefix - unsigned int lastSlashPos = croppedPath.rfind("/"); + std::string::size_type lastSlashPos = croppedPath.rfind("/"); if (lastSlashPos < croppedPath.size()-1) { restPath = croppedPath.substr(lastSlashPos+1); @@ -88,7 +88,7 @@ } // ............................collect list of entries in searchDir that match prefix restPath - unsigned int restLength = restPath.size(); + std::string::size_type restLength = restPath.size(); std::vector<std::string> matchingEntries; std::vector<std::string>::iterator iter = dir_entries.begin(); while (iter != dir_entries.end()) @@ -223,7 +223,7 @@ // -------------------------------------------------------------------------------------------------------- void KFileNameField::selectLastPathComponent () { - unsigned int lastSlashPos = text.rfind("/"); + std::string::size_type lastSlashPos = text.rfind("/"); if (lastSlashPos == text.size()-1) lastSlashPos = text.rfind("/", lastSlashPos-1); if (lastSlashPos < text.size()) cursor_pos = lastSlashPos+1; else cursor_pos = 0; --- a/src/gui/KikiMenu.cpp +++ b/src/gui/KikiMenu.cpp @@ -54,7 +54,7 @@ { std::string item_text (itemText); std::string event_name (itemText); - unsigned int pos; + std::string::size_type pos; float scale_factor = 1.0; KikiMenuItem * menu_item = new KikiMenuItem (); --- a/src/gui/KikiTextLine.cpp +++ b/src/gui/KikiTextLine.cpp @@ -46,7 +46,7 @@ void KikiTextLine::setText ( const std::string & str ) { text = str; - unsigned int pos; + std::string::size_type pos; if ((pos = text.find ("$scale(")) != std::string::npos) {