tests/testlib/topic_setup.sh
author Pulkit Goyal <7895pulkit@gmail.com>
Sun, 18 Mar 2018 23:48:06 +0530
changeset 3660 f018656ca3bf
parent 2828 fa2deeb5dd03
permissions -rw-r--r--
amend: add a new flag `--patch` to `hg amend` This patch adds a new flag `--patch` to `hg amend` which pops up an editor with the patch of working directory parent which you can change, and when you exit the editor the patch with changes is applied to current working directory with old changeset being obsoleted in favour of new one created by the applied patch. If supplied filenames, only those filenames are present in the popped editor and rest files stay the same way in the commit as they were. The extension of the file which opens up in editor is '.diff', we cannot have it as '.patch' as there will be develwarns related to that. We need to change to patch core and undo some change to achieve this. The implementation does not use any core API rather it has picked chunks from API which are required. One main reason to not use core import API is that we have to change wdir parent before using patch.patch() which I will like to avoid to make sure we handle merge cases too. While writing this patch I have spend lot of time try to use internal API's to work for this but none of them served the purpose well. If I have time in future and work on similar problem again, I am going to write better high-level API's which uses patchstore to achieve this. A new test file test-amend-patch.t which contains a lot of testing of the feature.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
#!/bin/sh
2828
fa2deeb5dd03 test: setup python path for topic tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2045
diff changeset
     2
. $TESTDIR/testlib/pythonpath.sh
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     3
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     4
# This file holds logic that is used in many tests.
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     5
# It can be called in a test like this:
2045
db617700d318 tests: move "test setup" script into a 'testlib' directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1901
diff changeset
     6
#  $ . "$TESTDIR/testlib/topic_setup.sh"
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     7
1840
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
     8
# Enable obsolete markers and enable extensions
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
     9
cat >> $HGRCPATH << EOF
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    10
[experimental]
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    11
evolution=createmarkers,exchange
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    12
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    13
[extensions]
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    14
rebase=
2828
fa2deeb5dd03 test: setup python path for topic tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2045
diff changeset
    15
topic=
1840
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    16
EOF