aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/resetboring.py
blob: a9f01e8c6fcfb70d479b2001e5e09ef51df137ee (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
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
#!/usr/bin/env python
# Usage: see api-review-gen.
#############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the release tools of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 3 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL3 included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 3 requirements
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 2.0 or (at your option) the GNU General
## Public license version 3 or any later version approved by the KDE Free
## Qt Foundation. The licenses are as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
## https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
#############################################################################
"""Script to exclude boring changes from the staging area for a commit

We start on a branch off an old release, with headers from a newer
branch checked out (and thus staged) in it; git diff should say
nothing, while git diff --cached describes how the headers have
changed.  We want to separate the boring changes (e.g. to copyright
headers) from the interesting ones (actual changes to the API).

The basic idea is to do an automated git reset -p that discards any
hunk entirely in the copyright header (recognized by its $-delimited
end marker) and, for any other hunks present, checks for certain
standard boring changes that we want to ignore.  If such changes are
present, the hunk is replaced by one that omits the given boring
changes; otherwise, the hunk is left alone.  Once we are done, git
diff --cached should contain nothing boring and git diff should be
entirely boring.  Only git's staging area is changed.

This script emits to stdout the names of files that should be restored
to their prior version (i.e. as in the old release; for files from the
newer branch, this should remove them); it is left to the script
driving this one (api-review-gen) to act on that.  Passing --disclaim
as a command-line option ensures all changed files with (known
variants on) the usual 'We mean it' disclaimer shall be named in this
output.

Errors and warnings are sent to stderr, not stdout.
Nothing is read from standard input.
"""

# See: https://www.dulwich.io/apidocs/dulwich.html
try:
    from dulwich.repo import Repo
    from dulwich.diff_tree import RenameDetector
except ImportError:
    print('I need the python package dulwich (python-dulwich on Debian).')
    raise

class Selector(object): # Select interesting changes, discard boring.
    """Handles removing boring changes from one file.

    The aim is to remove noise from header diffs, so that reviewers
    can focus on the small amounts of meaningful change and not waste
    time making sense of boring changes - such as declaring a method
    nothrow or constexpr; or changes to copyright headers - just so as
    to be sure they can be ignored.  Here, we automate ignoring those
    changes, so that real changes don't get missed by a reviewer so
    busy skipping over boring changes as to not notice the other
    changes mixed in with them.

    The instance serves as carrier for data needed by all parts of the
    filtering process, which is driven by the .refine() method.  A
    .restore() method is also provided to support putting back a
    deleted file.

    In .refine(), each diff hunk is studied to see whether any of the
    new versions' lines contain fragments that, if missing from the
    corresponding prior line, would indicate a boring change.  The
    Censor tool-class provides the tools used to decide what changes
    are boring.  Its .minimize() represents a line by a token
    sequence, with various 'boring' changes undone, that can be used
    to match a new line with an old, from which it has been derived by
    boring changes (even if the old also contained boring fragments).
    Once an old and new line have been found, that this identifies as
    matching, the .harmonize() will undo, from the new line, only
    those boring changes that are absent from the old, so as to reduce
    the new line to a form matching the old as closely as possible.

    Potential matching old lines are sought anywhere in the same hunk
    of diff as the new line to be matched, to allow for small
    movements and for diff being confused, by distractions, into
    misreporting; however, a line moved so far that its new and old
    forms appear in separate hunks shall not be matched up.  The old
    shall be seen as removed and the new as added, without any tidying
    of the new.  (Note that matching happens within hunks of the gross
    diff, before boring bits are filtered out: it is possible that,
    after filtering out other boring changes, the revised diff you
    actually come to review might bring together in a single hunk the
    old and new lines of a boring change that weren't in the same
    chunk when .refine()ing the original diff.)
    """

    def __init__(self, store, new, old, mode):
        """Set up ready to remove boring changes.

        Requires exactly four arguments:

          store -- the object store for our repo
          new -- sha1 of the new file
          old -- sha1 of the old file
          mode -- access permissions for the compromise file

        When .refine() is subsequently called, a new blob gets added
        to the store with the given mode, based on new but skipping
        boring changes relative to old.
        """
        self.__store, self.__mode = store, mode
        self.__old = self.__get_lines(store, old)
        self.__new = self.__get_lines(store, new)
        self.__headOld = self.__end_copyright(self.__old)
        self.__headNew = self.__end_copyright(self.__new)
        self.__hybrid = [] # A compromise between old and new.

    @staticmethod
    def __get_lines(store, sha1):
        if sha1 is None: return ()
        assert len(sha1) == 40, "Expected 40-byte SHA1 digest as name of blob"
        return tuple(store[sha1].as_raw_string().split('\n'))

    # Note: marker deliberately obfuscated so tools scanning *this*
    # file aren't mislead by it !
    @staticmethod
    def __end_copyright(seq, marker='_'.join(('$QT', 'END', 'LICENSE$'))):
        """Line number of the end of the copyright banner"""
        for i, line in enumerate(seq):
            if marker in line:
                return i
        return 0

    from difflib import SequenceMatcher
    # Can we supply a useful function isjunk, detecting pure-boring
    # lines, in place of None ?
    def __get_hunks(self, context, isjunk=None, differ=SequenceMatcher):
        return differ(isjunk, self.__old, self.__new).get_grouped_opcodes(context)
    del SequenceMatcher

    def refine(self, context=3):
        """Index entry for new, with its boring bits skipped.

        Single optional argument, context, is the number of lines of
        context to include at the start and end of each hunk of
        change; it defaults to 3.  Returns a dulwich IndexEntry
        representing the old file with the new file's interesting
        changes applied to it.
        """
        doneOld = doneNew = 0 # lines consumed already
        copy, digest = self.__copy, self.__digest
        for hunk in self.__get_hunks(context):
            # See __digest() for description of what each hunk is.  A
            # typical hunk starts and ends with an 'equal' block of
            # length context; however, the first in a file might not
            # start thus, nor need the last in a file end thus.
            # Between hunks, there is a tacit big 'equal' block;
            # likewise before the first and after the last.
            block = hunk.pop(0)
            tag, startOld, endOld, startNew, endNew = block
            if doneOld < startOld or doneNew < startNew:
                copy('implicit', doneOld, startOld, doneNew, startNew)
                # doneOld, doneNew = startOld, startNew
            if tag == 'equal':
                copy(*block)
                # doneOld, doneNew = endOld, endNew
            else: # put the block back to process as normal:
                hunk.insert(0, block)

            block = hunk.pop()
            tag, startOld, endOld, startNew, endNew = block
            # Must read last block before calling digest, which modifies hunk.
            if tag == 'equal':
                digest(hunk)
                copy(*block)
            else:
                # File ends in change; put it back to process as normal:
                hunk.append(block)
                digest(hunk)
            doneOld, doneNew = endOld, endNew

        if doneOld < len(self.__old) or doneNew < len(self.__new):
            copy('implicit', doneOld, len(self.__old), doneNew, len(self.__new))

        return self.__as_entry('\n'.join(self.__hybrid), self.__mode)

    from dulwich.objects import Blob
    from dulwich.index import IndexEntry
    def __as_entry(self, text, mode,
                   blob=Blob.from_string, entry=IndexEntry):
        """Turn a file's proposed contents into an IndexEntry.

        The returned IndexEntry's properties are mostly filler, as
        only the sha1 and mode are actually needed to update the index
        (along with the name, which caller is presumed to handle).
        """
        dull = blob(text)
        assert len(dull.id) == 40
        self.__store.add_object(dull)
        # entry((ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags))
        return entry((0, 0), (0, 0), 0, 0, mode, 0, 0, len(text), dull.id, 0)

    @staticmethod
    def restore(blob, mode, entry=IndexEntry):
        """Index entry for a specified extant blob.

        Requires exactly two arguments (do *not* pass a third):

          blob -- the Blob object describing the extant blob
          mode -- the mode to be used for this object

        Can be used to put back a deleted file.
        """
        assert len(blob.id) == 40, blob.id
        return entry((0, 0), (0, 0), 0, 0, mode, 0, 0,
                     len(blob.as_raw_string()), blob.id, 0)
    del Blob, IndexEntry

    def __copy(self, tag, startOld, endOld, startNew, endNew):
        assert tag in ('equal', 'implicit'), tag
        assert endOld - startOld == endNew - startNew, \
            'Unequal %s block lengths' % tag
        assert self.__old[startOld:endOld] == self.__new[startNew:endNew], \
            "Unequal %s blocks" % tag
        self.__hybrid += self.__new[startNew:endNew]

    def __digest(self, hunk):
        """Remove everything boring from a hunk.

        This is where the real work gets done.  Single argument, hunk,
        is a list of 5-tuples, (tag, startOld, endOld, startNew,
        endNew), describing a single hunk of the difference between
        two files.  Each relates a range of lines in the old file to a
        range of lines in the new: each range is expressed as
        start:end indices (starting at 0) in each file, with the tag -
        replace, delete, insert or equal - expressing the relation
        between them.  We need to identify boring changes and discard
        or undo them.

        Note that a boring change that difflib.py has mis-described,
        putting the original and final lines in different hunks, won't
        be caught; but, as long as they're in the same hunk (even if
        in different blocks of it), this code aims to catch them and
        undo (only) the boring parts.
        """
        tag, startOld, endOld, startNew, endNew = hunk.pop(0)
        # First deal with copyright header changes: always boring
        while endNew <= self.__headNew and endOld <= self.__headOld:
            if tag == 'equal':
                # Stricly: we should copy from old; but it makes no difference:
                self.__copy(tag, startOld, endOld, startNew, endNew)
            else:
                # discard the new version
                self.__hybrid += self.__old[startOld:endOld]

            if not hunk: return # completely digested already :-)
            tag, startOld, endOld, startNew, endNew = hunk.pop(0)

        if tag == 'equal': # Non-issue, as for fully in copyright:
            self.__copy(tag, startOld, endOld, startNew, endNew)
        else:
            if startNew < self.__headNew and startOld < self.__headOld:
                # This hunk is *partially* copyright.
                # Take copyright header part from old, ...
                if endOld > self.__headOld:
                    self.__hybrid += self.__old[startOld:self.__headOld]
                    startOld, startNew = self.__headOld, self.__headNew
                assert endOld > startOld or endNew > startNew
                # ... put the (rest of the) block back in the queue:
            hunk.insert(0, (tag, startOld, endOld, startNew, endNew))

        if not hunk: return # completely digested already :-)

        # The hybrid we'll use for the rest (but we'll modify it, in a bit):
        hybrid = list(self.__new[hunk[0][3]:hunk[-1][4]])
        # Tools to remove boring differences:
        bore = self.Censor()

        # Associate each line, involved in either side of the change,
        # with a canonical form; and some in old with their .strip():
        change, origin, unstrip = {}, {}, {}
        for line in set(hybrid):
            seq = []
            for mini in bore.minimize(line):
                if bore.join(line, mini) != line:
                    seq.append(mini)
            if seq:
                change[line] = tuple(seq)
            # else: line contains no boring changes
        for line in self.__old[hunk[0][1]:hunk[-1][2]]:
            for mini in bore.minimize(line):
                try: seq = origin[mini]
                except KeyError: seq = origin[mini] = []
                seq.append(line)
            # Interesting lines might have merely changed indentation:
            if set(line).difference('{\t \n};'):
                key = line.strip()
                try: was = unstrip[key]
                except KeyError: unstrip[key] = line
                else:
                    # If distinct lines have same .strip(), 'fixing'
                    # indent for them may add more diff than it
                    # removes; so use .get()'s default, None.
                    if was is not None and was != line:
                        unstrip[key] = None

        for i, new in enumerate(hybrid):
            old = unstrip.get(new.strip())
            if old is not None: # boring indent change:
                assert old.strip() == new.strip()
                hybrid[i] = old
                continue

            old = tuple(origin[m] for m in change.get(new, ()) if m in origin)
            if old:
                assert all(old), 'Every value of origin is a non-empty list'
                # TODO: chose which entry in old to use, if more than
                # one; and which line in that entry to use, if more
                # than one.
                hybrid[i] = bore.harmonize(old[0][0], new)
                # Until then, use the first list in old; and use its
                # entries in hybrid in the order they had in old (but,
                # to be on the safe side, don't remove from list;
                # cycle to the back, in case new has more than old):
                old[0].append(old[0].pop(0))
                continue

            # TODO: see if any key of origin is kinda similar to new.
            # Not crucial: the API has changed, so filtering out the
            # boring parts won't save the need to review the line,
            # although it would remove a distraction.

        assert len(hybrid) == hunk[-1][4] - hunk[0][3]
        self.__hybrid += hybrid

    class Censor (object): # knows how to be boring
        """Detects and eliminates boring changes.

        Public methods:
          minimize() -- Express line as a canonical token tuple.
          join() -- Recombine tokens, guided by a line.
          harmonize() -- Make one line as much like another as we can.
        Each only makes boring changes.

        Boring changes always happen at a tokenized level, so
        manipulate lines in tokenized form for ease of recognising and
        editing out boring bits.  Use .minimize() to tokenize; then
        .join() knows how to stitch the surviving tokens back
        together, following the form of the original line as far as
        possible.  The prior code may contain some boring parts, that
        we don't want to remove from the new version (else we'd get a
        spurious diff out of that); use harmonize() to remove what's
        boring from a new line, but keeping any of it that's present
        in the old line.

        Externally visible tokenizations (from minimize) are tuples of
        string fragments (with no space in them); internally, some
        tokens in the tuple may themselves be tuples, indicating that
        any entry in that token may be used in place of it, with a
        None entry meaning the whole token is optional.  Every
        externally visible tokenization is a legal internal
        tokenization; .join() accepts either kind.
        """

        @classmethod
        def minimize(cls, text):
            """Reduce text to a minimal sequence of tokens.

            Takes one required argument, text.  Yields tuples of
            tokens; each such tuple characterizes what's interesting
            in the line; usually there's only one, but some recipes
            may allow several.

            Splits text into tokens and applies all our know recipies
            for boring changes to it, reducing to a canonical form.
            Two lines should share a minimal form precisely if the
            only differences between them are boring.
            """
            tokens = cls.__split(text)
            for test, purge in cls.recipe:
                if test(tokens):
                    tokens = purge(tokens)

            return cls.__iter_variants(tuple(tokens))

        @classmethod
        def __iter_variants(cls, tokens):
            """Yield all variants on a token sequence.

            If any token is a tuple, instead of a simple string, yield
            each variant on the tokens, replacing each such tuple by
            each of its entries or omitting its contribution for a
            None entry, if it has one.
            """
            for ind, here in enumerate(tokens):
                if isinstance(here, tuple):
                    head, tail = tokens[:ind], tokens[ind + 1:]
                    for it in here:
                        mid = () if it is None else (it,) # omit optional
                        for rest in cls.__iter_variants(tail):
                            yield head + mid + rest
                    break # Out of outer for, bypassing its else.
            else:
                yield tokens

        @classmethod
        def harmonize(cls, old, new):
            """Return new, cleaned in whatever ways make it more like old."""
            olds, news = cls.__split(old), cls.__split(new)
            for test, purge in cls.recipe:
                if test(news) and not test(olds):
                    news = purge(news)
            return cls.join(old, news)

        # Punctuation at which to split, long tokens before their prefixes:
        cuts = ( '<<=', '>>=',
                 '//', '/*', '*/', '##', '::',
                 # Be sure that // precedes /= (see // = default)
                 '<<', '>>', '==', '!=', '<=', '>=', '&&', '||',
                 '+=', '*=', '-=', '/=', '&=', '|=', '%=', '->',
                 '#', '<', '>', '!', '?', ':', ',', '.', ';',
                 '=', '+', '-', '*', '/', '%', '|', '&', '^', '~',
                 '(', ')', '[', ']', '{', '}', '"', "'" )

        @classmethod
        def __split(cls, line):
            """Crudely tokenize: line -> tuple of string fragments"""
            tokens = line.strip().split()
            i = len(tokens)
            while i > 0:
                i -= 1
                word = tokens[i]

                if word in cls.cuts: continue
                for cut in cls.cuts:
                    if cut not in word: continue

                    bits = iter(word.split(cut))
                    # Shouldn't raise StopIteration, because cut was in word:
                    ind = bits.next()
                    if ind:
                        tokens[i] = ind # replacing word
                        i += 1 # insert the rest after it
                    else:
                        del tokens[i] # we'll start inserting where it was

                    for ind in bits:
                        tokens.insert(i, cut)
                        i += 1
                        if ind:
                            tokens.insert(i, ind)
                            i += 1
                    # We've replaced word in tokens; now process its
                    # fragments: index i points just beyond the last.
                    break

            assert all(tokens), 'No empty tokens'
            return tokens

        @classmethod
        def join(cls, orig, tokens):
            """Stitch tokens back together, guided by orig.

            Combine tokens with spacing so as to match orig as closely
            as possible.
            """
            # As we scan orig, we trim what we've scanned.
            text = '' # Our synthesized replacement for orig, made of tokens.
            copy = True # Do text and our last chomp off orig end the same way ?
            for j, word in enumerate(tokens):
                assert word, ("__split() never makes empty tokens", tokens, j)
                # How much space does orig start with ?
                indent = len(orig) - len(orig.lstrip())
                tail = orig[indent:]
                if isinstance(word, tuple):
                    best = None
                    for it in word:
                        if it is None or tail.startswith(it):
                            word = it
                            break
                        elif it in tail and best is None:
                            best = it
                    else: # if we didn't break
                        if best is not None:
                            word = best
                        else: # Word is an insertion: use first variant offered.
                            word = word[0]
                    if word is None:
                        # token is optional, no variant of it appears in orig; skip
                        continue

                # Is word the next thing after that ?
                if tail.startswith(word):
                    tail = tail[len(word):]
                    # Would word have been split around, here ?
                    if (word in cls.cuts
                        or ((not tail or tail[0].isspace()
                             or any(tail.startswith(c) for c in cls.cuts))
                            # This condition  is different in the loop below:
                            and (copy or indent
                                 or not text or text[-1].isspace()
                                 or any(text.endswith(c) for c in cls.cuts)))):
                        text += orig[:indent] + word
                        orig, copy = tail, True
                        continue

                # Did we insert word or drop some of orig ?  (A replace shall be
                # handled as an insert then a drop.)  For drop:
                # a) word must appear later than where we just checked; and
                offset = orig.find(word, indent + 1)
                # b) later (non-tuple) tokens that do appear in orig should do so later.
                rest = [w for w in tokens[j + 1:] if not isinstance(w, tuple) and w in orig]
                # Otherwise, assume word has been inserted.
                # NB: offset is either < 0 or > indent, so definitely not 0.
                tail = orig[offset + len(word):] if offset > 0 else ''
                while offset > 0 and all(w in tail for w in rest):
                    # Probably dropped some of orig - be persuaded if
                    # word would have been split around, here.

                    # What we've maybe dropped, give or take some space:
                    cut = orig[:offset] # Definitely not empty.

                    # Would __split() have split around word, here ?
                    if (word in cls.cuts
                        or ((not tail or tail[0].isspace()
                             or any(tail.startswith(c) for c in cls.cuts))
                            and (cut[-1].isspace() or
                                 any(cut.endswith(c) for c in cls.cuts)))):
                        # Believe we dropped some of orig:
                        if not text or not (copy or indent
                                            or text[-1].isalnum() == word[0].isalnum()):
                            pad = ''
                        elif indent and not cut[-indent:].isspace():
                            pad = cut[:indent]
                        else:
                            indent = len(cut) - len(cut.rstrip())
                            pad = cut[-indent:] if indent else ''

                        text += pad + word
                        orig, copy = tail, True
                        # So we're now done with this word.
                        break # Bypass the while's else clause

                    # Word and all tokens after it do appear in
                    # orig[offset:], but word's first appearance
                    # wouldn't have been split out; loop to look for a
                    # later appearance that would.
                    offset = orig.find(word, offset + 1)
                    tail = orig[offset + len(word):] if offset > 0 else ''

                else:
                    # We didn't break out of that; assume word is an insertion.
                    copy = False
                    if indent:
                        text += orig[:indent]
                        indent = 0
                    elif text and text[-1].isalnum() and word[0].isalnum():
                        text += ' '
                    text += word
                    if not indent and word[-1].isalnum() and orig and orig[0].isalnum():
                        orig = ' ' + orig # may get discarded in a drop next time round

            return text.rstrip() if orig else text

        def recipe():
            """Generates the sequence of recipes for boring changes.

            Yields various (test, purge) twoples, in which:
            test(tokens) determines whether a given sequence of tokens
            matches the end-state of some known boring change; and
            purge(tokens) returns the prior state that would result in
            the given list of tokens, were the boring change applied.
            The replacement list may include, in place of a single
            token, a tuple of candidates (in which None means the
            token can even be left out) to chose amongst, as described
            in the Censor class doc (internal tokenization).

            This is not a method; it provides a namespace we'll throw
            away when it's been run (as part of executing the class
            body), in which to prepare the various recipes, yielding
            each to be collected into the final sequence used by
            harmonize(), minimize().  That sequence then over-writes
            this transient function's name.

            Future: may want to replace the pairs with objects with
            some simple API, so we can extend it - e.g. to support
            command-line selection of which recipes to use, or to
            report how many hits we saw of each recipe.
            """

            # Fatuous substitutions (see below for Q_DECL_OVERRIDE):
            for pair in (('Q_QDOC', 'Q_CLANG_QDOC'),
                         ('Q_DECL_FINAL', 'final'),
                         ('Q_DECL_CONSTEXPR', 'constexpr'),
                         ('Q_DECL_NOTHROW', 'noexcept')):
                def test(words, k=pair[1]):
                    return k in words
                def purge(words, p=pair):
                    return [p[0] if w == p[1] else w for w in words]
                yield test, purge

            # Don't ignore constexpr or nothrow; can't retract once added to an API.
            # Words to ignore:
            for key in ('explicit', # ? 'inline',
                        'Q_REQUIRED_RESULT', 'Q_NORETURN',
                        'Q_DECL_CONST_FUNCTION', 'Q_ALWAYS_INLINE'):
                def test(words, k=key):
                    return k in words
                def purge(words, k=key):
                    return [w for w in words if w != k]
                yield test, purge

            # Can at least ignore inline when given with body:
            pair = ('inline', ';')
            def test(tokens, p=pair):
                return p[0] in tokens and p[1] not in tokens
            def purge(tokens, p=pair):
                return [w for w in tokens if w != p[0]]
            yield test, purge
            # TODO: however, it's actually the *reverse* of this change
            # that's boring; and the present infrastructure doesn't know
            # how to process that.  An undo method, reverse of purge,
            # could let harmonize do this; needs new as well as old, to
            # guide where to add entry to old.

            # Would like to
            # s/QtPrivate::QEnableIf<...>::Type/std::enable_if<...>::type/
            # but the brace-matching is a bit much for this parser; and it
            # tends to get split across lines anyway ...

            # Synonyms for 0:
            for key in ('Q_NULLPTR', 'nullptr'):
                def test(words, z=key):
                    return z in words
                def purge(words, z=key):
                    return [('0', 'Q_NULLPTR', 'nullptr') if w == z else w for w in words]
                yield test, purge

            # Filter out various common end-of-line comments:
            for sought in (('//', '=', 'default'), ('//', 'LCOV_EXCL_LINE')):
                def test(tokens, sought=sought, size=len(sought)):
                    return tuple(tokens[-size:]) == sought
                def purge(tokens, size=len(sought)):
                    return tokens[:-size]
                yield test, purge

            # Complications (involving optional tokens or tokens with
            # alternate forms) should go after all others, to avoid
            # needlessly exercising them:

            # 5.10: common switch from while (0) to while (false)
            # 5.12: Q_DECL_EQ_DELETE -> = delete
            # 5.14: qMove -> std::move
            for swap in ((('while', '(', '0', ')'), ('while', '(', 'false', ')')),
                         (('Q_DECL_EQ_DELETE', ';'), ('=', 'delete', ';')),
                         (('qMove',), ('std', '::', 'move')),
                         ):
                def find(words, after=swap[1]):
                    try:
                        ind = 0
                        while True:
                            ind = words.index(after[0], ind)
                            if len(words) < ind + len(after):
                                break # definitely doesn't match, here or later
                            if all(words[i + ind] == tok for i, tok in enumerate(after)):
                                yield ind
                            ind += 1
                    except ValueError: # when .index() doesn't find after[0]
                        pass
                def test(words, get=find):
                    for it in get(words):
                        return True
                    return False
                def purge(words, pair=swap, get=find):
                    offset, step = 0, len(pair[0]) - len(pair[1])
                    for ind in get(words):
                        ind += offset # Correct for earlier edits
                        words[ind : ind + len(pair[1])] = pair[0]
                        offset += step # Update the correction
                    return words
                yield test, purge

            # Used by next two #if-ery mungers:
            def find(words, key):
                assert None in key # so result *does* get set if we succeed
                if len(words) < len(key):
                    return None

                for pair in zip(words, key):
                    if pair[1] == None:
                        if all(x.isalnum() for x in pair[0].split('_')):
                            result = pair[0]
                        else:
                            return None
                    elif pair[0] != pair[1]:
                        return None

                # Didn't return early: so matched (and result *did* get set).
                return result, len(key)

            # 5.10: #ifndef QT_NO_XXX -> #if QT_CONFIG(xxx)
            swap = (('#', 'ifndef', None), ('#', 'if', 'QT_CONFIG', '(', None, ')'))
            def test(words, get=find, key=swap[1]):
                if get(words, key) is None:
                    return False
                words = words[len(key):] # OK if, after QT_CONFIG(), nothing but comment:
                if not words or words[0] == '//':
                    return True
                return words[0] == '/*' and '*/' not in words[:-1]
            def purge(words, get=find, pair=swap):
                name, length = get(words, pair[1])
                words[:length] = [x or 'QT_NO_' + name.upper() for x in pair[0]]
                return words
            yield test, purge

            # Canonicalise so that (among other things) QT_CONFIG matches either way:
            # #if !defined(...) -> #ifndef ...
            for swap in ( (('#', 'if', '!', 'defined', '(', None, ')'),
                           ('#', 'ifndef', None)),
                          # ... and the same for #if defined(...) -> #ifdef ...
                          (('#', 'if', 'defined', '(', None, ')'),
                           ('#', 'ifdef', None)) ):
                def test(words, get=find, key=swap[1]):
                    return get(words, key) is not None
                def purge(words, get=find, pair=swap):
                    name, length = get(words, pair[1])
                    words[:length] = [x or name for x in pair[0]]
                    return words
                yield test, purge

            # Used both by #if/#elif and by #endif processing:
            def find(words, keys):
                if (len(words) < len(keys)
                    or any(a != b for a, b in zip(words, keys[:-2]))
                    or words[len(keys) - 2] not in keys[-2]):
                    raise StopIteration
                ind, key = 0, keys[-1]
                while True:
                    try:
                        ind = words.index(key, ind)
                    except ValueError:
                        break
                    if ind < 0 or len(words) <= ind + 3:
                        break
                    ind += 1
                    if words[ind] != '(' or words[ind + 2] != ')':
                        continue
                    ind += 1
                    if words[ind].isalnum():
                        yield ind, 'QT_NO_' + words[ind].upper()
                    ind += 1

            # Also match QT_CONFIG() when part-way through a #if of #elif condition:
            sought = ('#', ('if', 'elif'), 'QT_CONFIG')
            def test(words, get=find, keys=sought):
                for it in get(words, keys):
                    return True
                return False
            def purge(words, get=find, keys=sought):
                for ind, name in get(words, keys):
                    assert words[ind - 2] == 'QT_CONFIG'
                    assert words[ind + 1] == ')'
                    words[ind - 2 : ind + 1] = ('!', 'defined', '(', name)
                return words
            yield test, purge

            # Catch similar in #endif-comments:
            sought=('#', 'endif', ('//', '/*'), 'QT_CONFIG')
            def test(words, get=find, keys=sought):
                for it in get(words, keys):
                    return True
                return False
            def purge(words, get=find, keys=sought):
                for ind, name in get(words, keys):
                    assert words[ind - 2] == 'QT_CONFIG'
                    words[ind - 2 : ind + 2] = [ ('!', None), name ]
                return words
            yield test, purge

            # Ignore parentheses on #if ... defined(blah) ...:
            sought = (('#', 'if'), 'defined')
            def find(words, start=sought[0], key=sought[1]):
                """Iterate indices in words of each blah in 'defined(blah)'"""
                if any(a != b for a, b in zip(words, start)):
                    raise StopIteration
                ind, ans = 0, []
                while True:
                    try:
                        ind = words.index(key, ind)
                    except ValueError:
                        break
                    if ind < 0 or len(words) <= ind + 3:
                        break
                    ind += 1
                    if words[ind] != '(' or words[ind + 2] != ')':
                        continue
                    ind += 1
                    if words[ind].isalnum():
                        yield ind
            def test(words, get=find):
                for it in get(words):
                    return True
                return False
            def purge(words, get=find):
                # Remove later tokens before earlier, so indices are still valid until used:
                for keep in reversed(tuple(get(words))):
                    del words[keep + 1]
                    del words[keep - 1]
                return words
            yield test, purge

            # "virtual blah(args)" -> "blah(args) Q_DECL_OVERRIDE" -> "blah(args) override"
            # but allow that virtual might never have been present
            # (hence the support for optional tokens, above)
            swap = ('virtual', ('Q_DECL_OVERRIDE', 'override'))
            def test(words, after=swap[1][1]):
                return after in words
            def purge(words, pair=swap[1]):
                return [pair[0] if w == pair[1] else w for w in words]
            yield test, purge
            def test(words, after=swap[1]):
                return any(s in words for s in after)
            def purge(words, s=swap):
                words = [w for w in words if w not in s[1]]
                # Add virtual at start, if absent, as optional token:
                if s[0] not in words:
                    words.insert(0, (s[0], None))
                return words
            yield test, purge

        # Sequence of (test, purge) pairs to detect boring and canonicalize it away:
        recipe = tuple(recipe())

class Scanner(object): # Support for its .disclaimed()
    __litmus = (
        'This file is not part of the Qt API',
        'This header file may change from version to version without notice, or even be removed',
        'Usage of this API may make your code source and binary incompatible with future versions of Qt',
        )

    @staticmethod
    def __warnPara(paragraph, grmbl):
        lines = ['  ' + s.strip() + '.' for s in paragraph.split('. ') if s]
        lines.insert(0, 'Suspected BC/SC disclaimer not recognized as such:')
        lines.append('') # ensure we end in a newline:
        grmbl('\n'.join(lines))

    @classmethod
    def disclaimed(cls, path, grmbl):
        """Detect the We Mean It (or similar) comment in a C++ file.

        Assumes the comment forms a contiguous sequence of C++-style
        comment lines.  Allows more flexibility than is actually
        observed, mainly because it has to be flexible about the main
        paragraph (there are several variants); being able to support
        flexibility there makes it easy to test the first few lines
        fuzzily."""
        warn, litmus, paragraph = 0, cls.__litmus, ''
        with open(path) as fd:
            for line in fd:
                line = line.strip()
                if line.startswith('//'):
                    line = line[2:].lstrip()
                else: # not a simple C++ comment
                    warn = 0
                    continue

                if warn == 0: # There's always an initial blank line:
                    if line:
                        if line == 'We mean it.' and paragraph.startswith('This file is'):
                            cls.__warnPara(paragraph, grmbl)
                        continue
                    warn = 1

                elif warn == 1:
                    if not line: # There may be several blank lines at the start.
                        continue
                    if ''.join(line.split()) != 'WARNING':
                        warn = 0
                        continue
                    warn = 2
                    paragraph = ''

                elif warn == 2: # Banner is always undelined with dashes:
                    if any(ch != '-' for ch in line):
                        warn = 0
                        continue
                    warn = 3

                elif line:
                    paragraph += line + ' '
                elif paragraph:
                    # Is this one of our familiar paragraphs ?
                    for sentence in paragraph.split('. '):
                        # Eliminate any irregularities in spacing:
                        if ' '.join(sentence.split()) in litmus:
                            grmbl('Filtered out C++ file with disclaimer: %s\n' % path)
                            return True
                    # Apparently not; but see 'We mean it.' check, above.
                    warn = 0
                # else: blank line before first paragraph

        return False

# Future: we may want to parse more args, query the user or wrap
# talk, complain for verbosity control.
def main(args, hear, talk, complain):
    """Reset boring changes

    See doc-string of this file for outline.

    Required arguments - args, hear, talk and complain -- should,
    respectively, be (or behave as, e.g. if mocking to test) sys.argv,
    sys.stdin, sys.stdout and sys.stderr.  The only command-line
    option supported (in args) is a '--disclaim' flag, to treat as
    boring all changes in files with the standard 'We mean it'
    disclaimer; it is usual to pass this flag.\n"""
    ignore = Scanner.disclaimed if '--disclaim' in args else (lambda p, w: False)

    # We're in the root directory of the module:
    repo = Repo('.')
    store, index = repo.object_store, repo.open_index()
    renamer = RenameDetector(store)
    try:
        # TODO: demand stronger similarity for a copy than for rename;
        # our huge copyright headers (and common boilerplate) make
        # small header files look very similar despite their real
        # content all being quite different.  Probably need to hack
        # dulwich (find_copies_harder is off by default anyway).
        for kind, old, new in \
            renamer.changes_with_renames(store[repo.refs['HEAD']].tree,
                                         index.commit(store)):
            # Each of old, new is a named triple of .path, .mode and
            # .sha; kind is the change type, in ('add', 'modify',
            # 'delete', 'rename', 'copy', 'unchanged'), although we
            # shouldn't get the last.  If new.path is None, file was
            # removed, not renamed; otherwise, if new has a
            # disclaimer, it's private despite its name and path.
            if new.path and not ignore(new.path, complain.write):
                assert kind not in ('unchanged', 'delete'), kind
                if kind != 'add':
                    # Filter out boring changes
                    index[new.path] = Selector(store, new.sha, old.sha,
                                               old.mode or new.mode).refine()
            elif old.path: # disclaimed or removed: ignore by restoring
                assert new.path or kind == 'delete', (kind, new.path)
                index[old.path] = Selector.restore(store[old.sha], old.mode)
                talk.write(old.path + '\n')
                if new.path and new.path != old.path:
                    talk.write(new.path + '\n')
            else: # new but disclaimed: ignore by discarding
                assert kind == 'add' and new.path, (kind, new.path)
                del index[new.path]
                talk.write(new.path + '\n')

        index.write()
    except IOError: # ... and any other errors that just mean failure.
        return 1
    return 0

if __name__ == '__main__':
    import sys
    sys.exit(main(sys.argv, sys.stdin, sys.stdout, sys.stderr))