| Mon, 07 Jan 2019 13:34:58 +0100 |
Franz Glasner |
Tested with Mercurial 4.8.1 also: unit-tests (and other invocations) are ok
|
| Mon, 07 Jan 2019 09:34:51 +0100 |
Franz Glasner |
FIX: Handle conflict marker output properly in "timestamps --show".
|
| Mon, 07 Jan 2019 09:17:10 +0100 |
Franz Glasner |
A new optional "ui" keyword argument for gen_matcher
|
| Sun, 06 Jan 2019 23:21:52 +0100 |
Franz Glasner |
Enhance documentation when using "lib-test-timestamps.sh" for a manual test setup
|
| Sun, 06 Jan 2019 20:09:00 +0100 |
Franz Glasner |
Test timestamps with merging r8 into r8 also
|
| Sun, 06 Jan 2019 20:06:46 +0100 |
Franz Glasner |
Test the other conflicting timestamp for test2 also
|
| Sun, 06 Jan 2019 15:19:28 +0100 |
Franz Glasner |
Handle new files that are coming from merged codelines
|
| Sat, 05 Jan 2019 17:04:50 +0100 |
Franz Glasner |
Test also the already implemented abort of a merge
|
| Sat, 05 Jan 2019 12:12:42 +0100 |
Franz Glasner |
Extend the lib-stat.py script to be able to assert timestamp differences.
|
| Fri, 04 Jan 2019 22:45:34 +0100 |
Franz Glasner |
Test the result of selective reverts when multiple files are changed
|
| Fri, 04 Jan 2019 22:39:38 +0100 |
Franz Glasner |
Use the canonical "hg commit" instead of "hg ci"
|
| Fri, 04 Jan 2019 22:38:37 +0100 |
Franz Glasner |
Test the commit of a list of files
|
| Fri, 04 Jan 2019 22:38:09 +0100 |
Franz Glasner |
- Check that "hg revert --all" leaves no changed files
|
| Fri, 04 Jan 2019 22:09:06 +0100 |
Franz Glasner |
Unit-tests for almost all currently implemented features of the timestamps extension.
|
| Fri, 04 Jan 2019 21:26:23 +0100 |
Franz Glasner |
WS
|
| Fri, 04 Jan 2019 18:06:03 +0100 |
Franz Glasner |
FIX: Use an explicit relative path within the example because shell's "source" seems to search in PATH
|
| Fri, 04 Jan 2019 17:34:13 +0100 |
Franz Glasner |
Help for for manual tests setup when using "lib-test-timestamps.sh":
|
| Fri, 04 Jan 2019 17:09:30 +0100 |
Franz Glasner |
First part of testing the a merge with yields conflicts (with tool ":merge3")
|
| Fri, 04 Jan 2019 16:58:46 +0100 |
Franz Glasner |
FIX: Create test2.txt always with a fixed defined modification time
|
| Fri, 04 Jan 2019 16:57:23 +0100 |
Franz Glasner |
FIX: "hg commit --quiet" when committing while creating a new head
|
| Fri, 04 Jan 2019 16:13:31 +0100 |
Franz Glasner |
RENAME: setup-timestamps.sh -> lib-test-timestamps.sh
|
| Fri, 04 Jan 2019 16:12:14 +0100 |
Franz Glasner |
A test repository is now fully created by a test script
|
| Fri, 04 Jan 2019 15:41:11 +0100 |
Franz Glasner |
FIX: The "ms" regex group in the timestamps parser can exist as empty group also
|
| Fri, 04 Jan 2019 10:46:22 +0100 |
Franz Glasner |
FIX: The shell's "source" does not accept params: pack into a function and prepare for a "SHOW_OUTPUT" flag
|
| Fri, 04 Jan 2019 00:56:03 +0100 |
Franz Glasner |
Prepare some of the very basics of unit-tests of the "timestamps" extension.
|
| Thu, 03 Jan 2019 23:19:09 +0100 |
Franz Glasner |
cmdutil.command is deprecated, use registrar.command instead; always require a repository also
|
| Fri, 28 Dec 2018 16:33:31 +0100 |
Franz Glasner |
FIX: Style
|
| Fri, 28 Dec 2018 16:33:17 +0100 |
Franz Glasner |
Put the debug output for the mergestate into an extra function
|
| Fri, 28 Dec 2018 16:32:01 +0100 |
Franz Glasner |
The "timestamps" implementation is for local repositories only.
|
| Sat, 11 Nov 2017 11:51:24 +0100 |
Franz Glasner |
CLOSE because does not work with subrepos
|
| Sat, 11 Nov 2017 11:03:50 +0100 |
Franz Glasner |
A new test for working with subrepos: does **NOT** work because of non-caching of subrepo instances.
|
| Mon, 07 Jan 2019 13:36:37 +0100 |
Franz Glasner |
Tested "revinfo" and "kwarchive" with Mercurial 4.8.1 also: unit-tests (and other invocations) are ok
|
| Mon, 07 Jan 2019 09:38:29 +0100 |
Franz Glasner |
>>>>> Added tag v3.1 for changeset 4ad07535a4d3
|
| Mon, 07 Jan 2019 09:36:41 +0100 |
Franz Glasner |
+++++ v3.1
v3.1
|
| Sun, 06 Jan 2019 23:58:13 +0100 |
Franz Glasner |
Enhance documentation when using "lib-test-revinfo.sh" or "lib-test-kwarchive.sh" for a manual test setup
|
| Sun, 06 Jan 2019 23:53:34 +0100 |
Franz Glasner |
Add unit-tests for the "revinfo" extension
|
| Sun, 06 Jan 2019 18:23:12 +0100 |
Franz Glasner |
Mercurial unit-tests for the "kwarchive" extension
|
| Sun, 06 Jan 2019 17:27:17 +0100 |
Franz Glasner |
Implement a "nouser" option for the path-filter: like no-pwd but without user information also
|
| Thu, 03 Jan 2019 23:17:13 +0100 |
Franz Glasner |
cmdutil.command is deprecated: use registrar.command instead; also need always a repository for the commands: inferrepo=True
|
| Thu, 20 Dec 2018 09:12:52 +0100 |
Franz Glasner |
FIX: Return the required default value if `alt' does not yield a better value
|
| Thu, 20 Dec 2018 00:01:59 +0100 |
Franz Glasner |
FIX: Typo in docu: [keyword] -> [keywords]
|
| Tue, 20 Nov 2018 09:39:07 +0100 |
Franz Glasner |
Enhance timestamps database to get values from other merge blocks (base, other, local)
|
| Tue, 13 Nov 2018 09:14:00 +0100 |
Franz Glasner |
Comment
|
| Tue, 06 Nov 2018 23:16:41 +0100 |
Franz Glasner |
Read all mergeblock types into separate dicts -- but preserve the order in the standard dict
|
| Mon, 05 Nov 2018 09:38:58 +0100 |
Franz Glasner |
Move current the merge block related input into the .read() method instead of the low-level dbreader()
|
| Sun, 04 Nov 2018 09:45:21 +0100 |
Franz Glasner |
Renamed variable "merge_block" to "mergeblock_type"
|
| Sat, 03 Nov 2018 23:13:53 +0100 |
Franz Glasner |
Count physical lines within quoted strings also
|
| Sat, 03 Nov 2018 22:58:08 +0100 |
Franz Glasner |
Counting line numbers in the "db_reader" now
|
| Sat, 03 Nov 2018 12:55:53 +0100 |
Franz Glasner |
Debug output of the global merge state also ("mdstate()")
|
| Wed, 31 Oct 2018 09:40:53 +0100 |
Franz Glasner |
Recognize blocks enclosed with merge tool markers.
|
| Wed, 31 Oct 2018 09:00:41 +0100 |
Franz Glasner |
Recognize comments only if the comment char is the first non-whitespace character in the line
|
| Tue, 30 Oct 2018 09:32:46 +0100 |
Franz Glasner |
Refactor: Move the different implementation paths for updating with one or two parent into different methods
|
| Mon, 29 Oct 2018 09:09:55 +0100 |
Franz Glasner |
Comments
|
| Sun, 28 Oct 2018 16:48:15 +0100 |
Franz Glasner |
Enhanced wording in messages
|
| Sun, 28 Oct 2018 16:46:18 +0100 |
Franz Glasner |
Make sure that "_resotre_timestamps()" works on local repositories only
|
| Wed, 24 Oct 2018 23:30:08 +0200 |
Franz Glasner |
FIX: Do a real return when updating in preview mode
|
| Wed, 24 Oct 2018 09:43:01 +0200 |
Franz Glasner |
First Tests and Debug-Output with real merges: some basic assumptions are wrong:
|
| Tue, 23 Oct 2018 21:52:43 +0200 |
Franz Glasner |
Documented what hook parts are implemented for now
|
| Tue, 23 Oct 2018 09:36:55 +0200 |
Franz Glasner |
Implemented the post-revert hook completely
|
| Mon, 22 Oct 2018 14:41:39 +0200 |
Franz Glasner |
Don't throw on non-local repositories: just skip the timestamps-related work
|
