tests/histedit-helpers.sh
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 17 Aug 2017 13:04:47 -0700
changeset 33886 13dc7f29531e
parent 27350 890273343170
permissions -rw-r--r--
exchange: don't attempt phase exchange if phase-heads was in bundle The Mercurial core server doesn't yet include phase-heads parts in the bundle, but our Google-internal server wants to do that. Unfortunately, the usual exchange still happens even if phase-heads part is included (including the short-circuited one for old/publishing servers). That means that even if our server (again, the Google-internal one, but also future Mercurial core servers) includes a phase-heads part to indicate that some heads should be drafts, that would still get overwritten by the phase updating that happens after. So let's fix that by marking the phase step done if we receive at least one phase-heads part in the bundle. Differential Revision: https://phab.mercurial-scm.org/D440
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
     1
fixbundle() {
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
     2
    grep -v 'saving bundle' | grep -v 'saved backup' | \
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
     3
        grep -v added | grep -v adding | \
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
     4
        grep -v "unable to find 'e' for patching" | \
27350
890273343170 tests: histedit-helpers fixbundle should not complain about no input
timeless <timeless@mozdev.org>
parents: 17085
diff changeset
     5
        grep -v "e: No such file or directory" | \
890273343170 tests: histedit-helpers fixbundle should not complain about no input
timeless <timeless@mozdev.org>
parents: 17085
diff changeset
     6
    cat
17064
168cc52ad7c2 histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff changeset
     7
}